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.287 by root, Mon Jun 5 05:31:13 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 76 if $FOCUS;
76} 77}
… …
88 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
89 90
90 $GRAB = $widget; 91 $GRAB = $widget;
91 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
92 93
93 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
94 } 95 }
95 96
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 98
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
113 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 116 $grab->update if $grab;
116 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
117 118
118 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
119 } 120 }
120} 121}
121 122
122sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
123 my ($ev) = @_; 124 my ($ev) = @_;
… …
129 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
130 131
131 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
132 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
133 134
134 check_tooltip; 135 $TOOLTIP_WATCHER->start;
135 } 136 }
136 137
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 139 if $HOVER;
139} 140}
… …
277 delete $self->{visible}; 278 delete $self->{visible};
278 279
279 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
281 282
282 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
284 285
285 $self->focus_out; 286 $self->focus_out;
286 287
287 $self->emit (visibility_change => 0); 288 $self->emit (visibility_change => 0);
… …
381} 382}
382 383
383sub set_max_size { 384sub set_max_size {
384 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
385 386
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
388} 391}
389 392
390sub set_tooltip { 393sub set_tooltip {
391 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
392 395
… …
397 400
398 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
399 402
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
403 } 406 }
404} 407}
405 408
406# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
407sub coord2local { 410sub coord2local {
… …
1536 1539
1537 delete $self->{texture}; 1540 delete $self->{texture};
1538 $self->SUPER::update; 1541 $self->SUPER::update;
1539} 1542}
1540 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1541sub set_text { 1551sub set_text {
1542 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1543 1553
1544 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1545 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1546 1556
1547 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1548 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1559 delete $self->{req_h};
1549 1560
1550 $self->realloc; 1561 $self->realloc;
1551 $self->update; 1562 $self->update;
1552} 1563}
1553 1564
… …
1559 1570
1560 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1561 1572
1562 $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;
1563 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1575 delete $self->{req_h};
1564 1576
1565 $self->realloc; 1577 $self->realloc;
1566 $self->update; 1578 $self->update;
1567} 1579}
1568 1580
1569sub size_request { 1581sub size_request {
1570 my ($self) = @_; 1582 my ($self) = @_;
1571 1583
1584 if (exists $self->{req_h}) {
1585 @$self{qw(req_w req_h)}
1586 } else {
1572 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1587 $self->{layout}->set_font ($self->{font}) if $self->{font};
1573 $self->{layout}->set_width ($self->{max_w} || -1); 1588 $self->{layout}->set_width ($self->{max_w} || -1);
1574 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1589 $self->{layout}->set_ellipsise ($self->{ellipsise});
1575 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1576 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1577 1592
1578 my ($w, $h) = $self->{layout}->size; 1593 my ($w, $h) = $self->{layout}->size;
1579 1594
1580 if (exists $self->{template}) { 1595 if (exists $self->{template}) {
1581 $self->{template}->set_font ($self->{font}) if $self->{font}; 1596 $self->{template}->set_font ($self->{font}) if $self->{font};
1582 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1583 1598
1584 my ($w2, $h2) = $self->{template}->size; 1599 my ($w2, $h2) = $self->{template}->size;
1585 1600
1586 $w = List::Util::max $w, $w2; 1601 $w = List::Util::max $w, $w2;
1587 $h = List::Util::max $h, $h2; 1602 $h = List::Util::max $h, $h2;
1588 } 1603 }
1589 1604
1590 ($w, $h) 1605 ($w, $h)
1606 }
1591} 1607}
1592 1608
1593sub size_allocate { 1609sub size_allocate {
1594 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1595 1611
… …
1633 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1634 : ($self->{h} - $tex->{h}) * 0.5); 1650 : ($self->{h} - $tex->{h}) * 0.5);
1635 }; 1651 };
1636 1652
1637 glEnable GL_TEXTURE_2D; 1653 glEnable GL_TEXTURE_2D;
1654
1655 if ($tex->{format} == GL_ALPHA) {
1656 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1657 glColor @{$self->{fg}};
1658 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1659 } else {
1638 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1639
1640 glColor_premultiply @{$self->{fg}}
1641 if $tex->{format} == GL_ALPHA;
1642
1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1661 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1662 }
1644 1663
1645 glDisable GL_TEXTURE_2D; 1664 glDisable GL_TEXTURE_2D;
1646} 1665}
1647 1666
1648############################################################################# 1667#############################################################################
… …
1680 $self->{last_activity} = $::NOW; 1699 $self->{last_activity} = $::NOW;
1681 $self->{text} = $text; 1700 $self->{text} = $text;
1682 1701
1683 $text =~ s/./*/g if $self->{hidden}; 1702 $text =~ s/./*/g if $self->{hidden};
1684 $self->{layout}->set_text ("$text "); 1703 $self->{layout}->set_text ("$text ");
1704 delete $self->{req_h};
1685 1705
1686 $self->_emit (changed => $self->{text}); 1706 $self->_emit (changed => $self->{text});
1707
1708 $self->realloc;
1687 $self->update; 1709 $self->update;
1688} 1710}
1689 1711
1690sub set_text { 1712sub set_text {
1691 my ($self, $text) = @_; 1713 my ($self, $text) = @_;
1692 1714
1693 $self->{cursor} = length $text; 1715 $self->{cursor} = length $text;
1694 $self->_set_text ($text); 1716 $self->_set_text ($text);
1695
1696 $self->realloc;
1697} 1717}
1698 1718
1699sub get_text { 1719sub get_text {
1700 $_[0]{text} 1720 $_[0]{text}
1701} 1721}
… …
3067our @ISA = CFClient::UI::VBox::; 3087our @ISA = CFClient::UI::VBox::;
3068 3088
3069sub new { 3089sub new {
3070 my $class = shift; 3090 my $class = shift;
3071 3091
3072 $class->SUPER::new ( 3092 my $self = $class->SUPER::new (
3073 fontsize => 0.8, 3093 fontsize => 0.8,
3074 @_, 3094 @_,
3075 ) 3095 );
3096
3097 Scalar::Util::weaken (my $this = $self);
3098
3099 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3100
3101 $self
3076} 3102}
3077 3103
3078sub reorder { 3104sub reorder {
3079 my ($self) = @_; 3105 my ($self) = @_;
3080 my $NOW = time; 3106 my $NOW = Time::HiRes::time;
3107
3108 # freeze display when hovering over any label
3109 return if $CFClient::UI::TOOLTIP->{owner}
3110 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3111 values %{ $self->{item} };
3081 3112
3082 while (my ($k, $v) = each %{ $self->{item} }) { 3113 while (my ($k, $v) = each %{ $self->{item} }) {
3083 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3114 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3084 } 3115 }
3085 3116
… …
3088 my @items = sort { 3119 my @items = sort {
3089 $a->{pri} <=> $b->{pri} 3120 $a->{pri} <=> $b->{pri}
3090 or $b->{id} <=> $a->{id} 3121 or $b->{id} <=> $a->{id}
3091 } values %{ $self->{item} }; 3122 } values %{ $self->{item} };
3092 3123
3124 $self->{timer}->interval (1);
3125
3093 my $count = 10 + 1; 3126 my $count = 10 + 1;
3094 for my $item (@items) { 3127 for my $item (@items) {
3095 last unless --$count; 3128 last unless --$count;
3096 3129
3097 push @widgets, $item->{label} ||= do { 3130 my $label = $item->{label} ||= do {
3098 # TODO: doesn't handle markup well (read as: at all) 3131 # TODO: doesn't handle markup well (read as: at all)
3099 my $short = $item->{count} > 1 3132 my $short = $item->{count} > 1
3100 ? "<b>$item->{count} ×</b> $item->{text}" 3133 ? "<b>$item->{count} ×</b> $item->{text}"
3101 : $item->{text}; 3134 : $item->{text};
3102 3135
… …
3110 tooltip => $item->{tooltip}, 3143 tooltip => $item->{tooltip},
3111 tooltip_font => $::FONT_PROP, 3144 tooltip_font => $::FONT_PROP,
3112 tooltip_width => 0.67, 3145 tooltip_width => 0.67,
3113 fontsize => $item->{fontsize} || $self->{fontsize}, 3146 fontsize => $item->{fontsize} || $self->{fontsize},
3114 max_w => $::WIDTH * 0.44, 3147 max_w => $::WIDTH * 0.44,
3115 fg => $item->{fg}, 3148 fg => [@{ $item->{fg} }],
3116 can_events => 1, 3149 can_events => 1,
3117 can_hover => 1 3150 can_hover => 1
3118 }; 3151 };
3152
3153 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3154 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3155 $label->update;
3156 $label->set_max_size (undef, $label->{req_h} * $diff)
3157 if $diff < 1;
3158 $self->{timer}->interval (1/30);
3159 } else {
3160 $label->{fg}[3] = $item->{fg}[3] || 1;
3161 }
3162
3163 push @widgets, $label;
3119 } 3164 }
3120 3165
3121 $self->clear; 3166 $self->clear;
3122 $self->SUPER::add (reverse @widgets); 3167 $self->SUPER::add (reverse @widgets);
3123} 3168}
… …
3128 $text =~ s/^\s+//; 3173 $text =~ s/^\s+//;
3129 $text =~ s/\s+$//; 3174 $text =~ s/\s+$//;
3130 3175
3131 return unless $text; 3176 return unless $text;
3132 3177
3133 my $timeout = time + ((delete $arg{timeout}) || 60); 3178 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3134 3179
3135 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3180 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3136 3181
3137 if (my $item = $self->{item}{$group}) { 3182 if (my $item = $self->{item}{$group}) {
3138 if ($item->{text} eq $text) { 3183 if ($item->{text} eq $text) {
… …
3168 3213
3169 $self->reorder; 3214 $self->reorder;
3170 $self->SUPER::reconfigure; 3215 $self->SUPER::reconfigure;
3171} 3216}
3172 3217
3218sub DESTROY {
3219 my ($self) = @_;
3220
3221 $self->{timer}->cancel;
3222
3223 $self->SUPER::DESTROY;
3224}
3225
3173############################################################################# 3226#############################################################################
3174 3227
3175package CFClient::UI::Inventory; 3228package CFClient::UI::Inventory;
3176 3229
3177our @ISA = CFClient::UI::ScrolledWindow::; 3230our @ISA = CFClient::UI::ScrolledWindow::;
… …
3469 3522
3470package CFClient::UI::Root; 3523package CFClient::UI::Root;
3471 3524
3472our @ISA = CFClient::UI::Container::; 3525our @ISA = CFClient::UI::Container::;
3473 3526
3527use List::Util qw(min max);
3528
3474use CFClient::OpenGL; 3529use CFClient::OpenGL;
3475 3530
3476sub new { 3531sub new {
3477 my $class = shift; 3532 my $class = shift;
3478 3533
… …
3612 3667
3613 delete $queue{$widget+0}; 3668 delete $queue{$widget+0};
3614 3669
3615 my ($w, $h) = $widget->size_request; 3670 my ($w, $h) = $widget->size_request;
3616 3671
3617 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3672 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3618 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3673 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3674
3675 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3676 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3619 3677
3620 $w = $widget->{force_w} if exists $widget->{force_w}; 3678 $w = $widget->{force_w} if exists $widget->{force_w};
3621 $h = $widget->{force_h} if exists $widget->{force_h}; 3679 $h = $widget->{force_h} if exists $widget->{force_h};
3622 3680
3623 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3681 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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