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.279 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.283 by root, Mon Jun 5 02:28:30 2006 UTC

… …
381} 381}
382 382
383sub set_max_size { 383sub set_max_size {
384 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
385 385
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
388} 390}
389 391
390sub set_tooltip { 392sub set_tooltip {
391 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
392 394
… …
1536 1538
1537 delete $self->{texture}; 1539 delete $self->{texture};
1538 $self->SUPER::update; 1540 $self->SUPER::update;
1539} 1541}
1540 1542
1543sub realloc {
1544 my ($self) = @_;
1545
1546 delete $self->{ox};
1547 $self->SUPER::realloc;
1548}
1549
1541sub set_text { 1550sub set_text {
1542 my ($self, $text) = @_; 1551 my ($self, $text) = @_;
1543 1552
1544 return if $self->{text} eq "T$text"; 1553 return if $self->{text} eq "T$text";
1545 $self->{text} = "T$text"; 1554 $self->{text} = "T$text";
1546 1555
1547 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1548 $self->{layout}->set_text ($text); 1557 $self->{layout}->set_text ($text);
1558 delete $self->{req_h};
1549 1559
1550 $self->realloc; 1560 $self->realloc;
1551 $self->update; 1561 $self->update;
1552} 1562}
1553 1563
… …
1559 1569
1560 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1570 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1561 1571
1562 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1572 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1563 $self->{layout}->set_markup ($markup); 1573 $self->{layout}->set_markup ($markup);
1574 delete $self->{req_h};
1564 1575
1565 $self->realloc; 1576 $self->realloc;
1566 $self->update; 1577 $self->update;
1567} 1578}
1568 1579
1569sub size_request { 1580sub size_request {
1570 my ($self) = @_; 1581 my ($self) = @_;
1571 1582
1583 if (exists $self->{req_h}) {
1584 @$self{qw(req_w req_h)}
1585 } else {
1572 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1586 $self->{layout}->set_font ($self->{font}) if $self->{font};
1573 $self->{layout}->set_width ($self->{max_w} || -1); 1587 $self->{layout}->set_width ($self->{max_w} || -1);
1574 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1588 $self->{layout}->set_ellipsise ($self->{ellipsise});
1575 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1576 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1577 1591
1578 my ($w, $h) = $self->{layout}->size; 1592 my ($w, $h) = $self->{layout}->size;
1579 1593
1580 if (exists $self->{template}) { 1594 if (exists $self->{template}) {
1581 $self->{template}->set_font ($self->{font}) if $self->{font}; 1595 $self->{template}->set_font ($self->{font}) if $self->{font};
1582 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1596 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1583 1597
1584 my ($w2, $h2) = $self->{template}->size; 1598 my ($w2, $h2) = $self->{template}->size;
1585 1599
1586 $w = List::Util::max $w, $w2; 1600 $w = List::Util::max $w, $w2;
1587 $h = List::Util::max $h, $h2; 1601 $h = List::Util::max $h, $h2;
1588 } 1602 }
1589 1603
1590 ($w, $h) 1604 ($w, $h)
1605 }
1591} 1606}
1592 1607
1593sub size_allocate { 1608sub size_allocate {
1594 my ($self, $w, $h) = @_; 1609 my ($self, $w, $h) = @_;
1595 1610
… …
1680 $self->{last_activity} = $::NOW; 1695 $self->{last_activity} = $::NOW;
1681 $self->{text} = $text; 1696 $self->{text} = $text;
1682 1697
1683 $text =~ s/./*/g if $self->{hidden}; 1698 $text =~ s/./*/g if $self->{hidden};
1684 $self->{layout}->set_text ("$text "); 1699 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h};
1685 1701
1686 $self->_emit (changed => $self->{text}); 1702 $self->_emit (changed => $self->{text});
1703
1704 $self->realloc;
1687 $self->update; 1705 $self->update;
1688} 1706}
1689 1707
1690sub set_text { 1708sub set_text {
1691 my ($self, $text) = @_; 1709 my ($self, $text) = @_;
1692 1710
1693 $self->{cursor} = length $text; 1711 $self->{cursor} = length $text;
1694 $self->_set_text ($text); 1712 $self->_set_text ($text);
1695
1696 $self->realloc;
1697} 1713}
1698 1714
1699sub get_text { 1715sub get_text {
1700 $_[0]{text} 1716 $_[0]{text}
1701} 1717}
… …
3067our @ISA = CFClient::UI::VBox::; 3083our @ISA = CFClient::UI::VBox::;
3068 3084
3069sub new { 3085sub new {
3070 my $class = shift; 3086 my $class = shift;
3071 3087
3072 $class->SUPER::new ( 3088 my $self = $class->SUPER::new (
3073 fontsize => 0.8, 3089 fontsize => 0.8,
3074 @_, 3090 @_,
3075 ) 3091 );
3092
3093 Scalar::Util::weaken (my $this = $self);
3094
3095 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3096
3097 $self
3076} 3098}
3077 3099
3078sub reorder { 3100sub reorder {
3079 my ($self) = @_; 3101 my ($self) = @_;
3080 my $NOW = time; 3102 my $NOW = Time::HiRes::time;
3103
3104 # freeze display when hovering over any label
3105 return if $CFClient::UI::TOOLTIP->{owner}
3106 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3107 values %{ $self->{item} };
3081 3108
3082 while (my ($k, $v) = each %{ $self->{item} }) { 3109 while (my ($k, $v) = each %{ $self->{item} }) {
3083 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3110 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3084 } 3111 }
3085 3112
… …
3088 my @items = sort { 3115 my @items = sort {
3089 $a->{pri} <=> $b->{pri} 3116 $a->{pri} <=> $b->{pri}
3090 or $b->{id} <=> $a->{id} 3117 or $b->{id} <=> $a->{id}
3091 } values %{ $self->{item} }; 3118 } values %{ $self->{item} };
3092 3119
3120 $self->{timer}->interval (1);
3121
3093 my $count = 10 + 1; 3122 my $count = 10 + 1;
3094 for my $item (@items) { 3123 for my $item (@items) {
3095 last unless --$count; 3124 last unless --$count;
3096 3125
3097 push @widgets, $item->{label} ||= do { 3126 my $label = $item->{label} ||= do {
3098 # TODO: doesn't handle markup well (read as: at all) 3127 # TODO: doesn't handle markup well (read as: at all)
3099 my $short = $item->{count} > 1 3128 my $short = $item->{count} > 1
3100 ? "<b>$item->{count} ×</b> $item->{text}" 3129 ? "<b>$item->{count} ×</b> $item->{text}"
3101 : $item->{text}; 3130 : $item->{text};
3102 3131
… …
3110 tooltip => $item->{tooltip}, 3139 tooltip => $item->{tooltip},
3111 tooltip_font => $::FONT_PROP, 3140 tooltip_font => $::FONT_PROP,
3112 tooltip_width => 0.67, 3141 tooltip_width => 0.67,
3113 fontsize => $item->{fontsize} || $self->{fontsize}, 3142 fontsize => $item->{fontsize} || $self->{fontsize},
3114 max_w => $::WIDTH * 0.44, 3143 max_w => $::WIDTH * 0.44,
3115 fg => $item->{fg}, 3144 fg => [@{ $item->{fg} }],
3116 can_events => 1, 3145 can_events => 1,
3117 can_hover => 1 3146 can_hover => 1
3118 }; 3147 };
3148
3149 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3150 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3151 $label->update;
3152 $label->set_max_size (undef, $label->{req_h} * $diff)
3153 if $diff < 1;
3154 $self->{timer}->interval (1/30);
3155 } else {
3156 $label->{fg}[3] = $item->{fg}[3] || 1;
3157 }
3158
3159 push @widgets, $label;
3119 } 3160 }
3120 3161
3121 $self->clear; 3162 $self->clear;
3122 $self->SUPER::add (reverse @widgets); 3163 $self->SUPER::add (reverse @widgets);
3123} 3164}
… …
3128 $text =~ s/^\s+//; 3169 $text =~ s/^\s+//;
3129 $text =~ s/\s+$//; 3170 $text =~ s/\s+$//;
3130 3171
3131 return unless $text; 3172 return unless $text;
3132 3173
3133 my $timeout = time + ((delete $arg{timeout}) || 60); 3174 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3134 3175
3135 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3176 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3136 3177
3137 if (my $item = $self->{item}{$group}) { 3178 if (my $item = $self->{item}{$group}) {
3138 if ($item->{text} eq $text) { 3179 if ($item->{text} eq $text) {
… …
3168 3209
3169 $self->reorder; 3210 $self->reorder;
3170 $self->SUPER::reconfigure; 3211 $self->SUPER::reconfigure;
3171} 3212}
3172 3213
3214sub DESTROY {
3215 my ($self) = @_;
3216
3217 $self->{timer}->cancel;
3218
3219 $self->SUPER::DESTROY;
3220}
3221
3173############################################################################# 3222#############################################################################
3174 3223
3175package CFClient::UI::Inventory; 3224package CFClient::UI::Inventory;
3176 3225
3177our @ISA = CFClient::UI::ScrolledWindow::; 3226our @ISA = CFClient::UI::ScrolledWindow::;
… …
3469 3518
3470package CFClient::UI::Root; 3519package CFClient::UI::Root;
3471 3520
3472our @ISA = CFClient::UI::Container::; 3521our @ISA = CFClient::UI::Container::;
3473 3522
3523use List::Util qw(min max);
3524
3474use CFClient::OpenGL; 3525use CFClient::OpenGL;
3475 3526
3476sub new { 3527sub new {
3477 my $class = shift; 3528 my $class = shift;
3478 3529
… …
3612 3663
3613 delete $queue{$widget+0}; 3664 delete $queue{$widget+0};
3614 3665
3615 my ($w, $h) = $widget->size_request; 3666 my ($w, $h) = $widget->size_request;
3616 3667
3617 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3668 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3618 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3669 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3670
3671 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3672 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3619 3673
3620 $w = $widget->{force_w} if exists $widget->{force_w}; 3674 $w = $widget->{force_w} if exists $widget->{force_w};
3621 $h = $widget->{force_h} if exists $widget->{force_h}; 3675 $h = $widget->{force_h} if exists $widget->{force_h};
3622 3676
3623 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3677 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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