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.276 by root, Sun Jun 4 00:16:01 2006 UTC vs.
Revision 1.288 by root, Mon Jun 5 21:14:40 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 {
… …
523} 526}
524 527
525sub reconfigure { 528sub reconfigure {
526 my ($self) = @_; 529 my ($self) = @_;
527 530
531 # some widgets cache req_w and req_h
532 delete $self->{req_w};
533 delete $self->{req_h};
534
528 $self->realloc; 535 $self->realloc;
529 $self->update; 536 $self->update;
530} 537}
531 538
532# using global variables seems a bit hacky, but passing through all drawing 539# using global variables seems a bit hacky, but passing through all drawing
… …
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 555 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 556 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 557
551 glPushMatrix; 558 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0; 559 glTranslate $self->{x}, $self->{y}, 0;
553 $self->_draw;
554 glPopMatrix;
555 560
556 if ($self == $HOVER && $self->{can_hover}) { 561 if ($self == $HOVER && $self->{can_hover}) {
557 my ($x, $y) = @$self{qw(x y)};
558
559 glColor 1, 0.8, 0.5, 0.2; 562 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
560 glEnable GL_BLEND; 563 glEnable GL_BLEND;
561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 564 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562 glBegin GL_QUADS; 565 glBegin GL_QUADS;
563 glVertex $x , $y; 566 glVertex 0 , 0;
564 glVertex $x + $self->{w}, $y; 567 glVertex $self->{w}, 0;
565 glVertex $x + $self->{w}, $y + $self->{h}; 568 glVertex $self->{w}, $self->{h};
566 glVertex $x , $y + $self->{h}; 569 glVertex 0 , $self->{h};
567 glEnd; 570 glEnd;
568 glDisable GL_BLEND; 571 glDisable GL_BLEND;
569 } 572 }
570 573
571 if ($ENV{CFPLUS_DEBUG} & 1) { 574 if ($ENV{CFPLUS_DEBUG} & 1) {
572 glPushMatrix; 575 glPushMatrix;
573 glColor 1, 1, 0, 1; 576 glColor 1, 1, 0, 1;
574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 577 glTranslate 0.375, 0.375;
575 glBegin GL_LINE_LOOP; 578 glBegin GL_LINE_LOOP;
576 glVertex 0 , 0; 579 glVertex 0 , 0;
577 glVertex $self->{w} - 1, 0; 580 glVertex $self->{w} - 1, 0;
578 glVertex $self->{w} - 1, $self->{h} - 1; 581 glVertex $self->{w} - 1, $self->{h} - 1;
579 glVertex 0 , $self->{h} - 1; 582 glVertex 0 , $self->{h} - 1;
580 glEnd; 583 glEnd;
581 glPopMatrix; 584 glPopMatrix;
582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 585 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
583 } 586 }
587
588 $self->_draw;
589 glPopMatrix;
584} 590}
585 591
586sub _draw { 592sub _draw {
587 my ($self) = @_; 593 my ($self) = @_;
588 594
… …
626 632
627 if ($color && (@$color < 4 || $color->[3])) { 633 if ($color && (@$color < 4 || $color->[3])) {
628 my ($w, $h) = @$self{qw(w h)}; 634 my ($w, $h) = @$self{qw(w h)};
629 635
630 glEnable GL_BLEND; 636 glEnable GL_BLEND;
631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 637 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632 glColor @$color; 638 glColor_premultiply @$color;
633 639
634 glBegin GL_QUADS; 640 glBegin GL_QUADS;
635 glVertex 0 , 0; 641 glVertex 0 , 0;
636 glVertex 0 , $h; 642 glVertex 0 , $h;
637 glVertex $w, $h; 643 glVertex $w, $h;
… …
856 my $tex = $self->{texture} 862 my $tex = $self->{texture}
857 or return; 863 or return;
858 864
859 glEnable GL_TEXTURE_2D; 865 glEnable GL_TEXTURE_2D;
860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
861 glColor 1, 1, 1, 1; 867 glColor 0, 0, 0, 1;
862 868
863 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 869 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
864 870
865 glDisable GL_TEXTURE_2D; 871 glDisable GL_TEXTURE_2D;
866} 872}
… …
1035 1041
1036 if ($self->{bg}) { 1042 if ($self->{bg}) {
1037 my ($w, $h) = @$self{qw(w h)}; 1043 my ($w, $h) = @$self{qw(w h)};
1038 1044
1039 glEnable GL_BLEND; 1045 glEnable GL_BLEND;
1040 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1046 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1041 glColor @{ $self->{bg} }; 1047 glColor_premultiply @{ $self->{bg} };
1042 1048
1043 glBegin GL_QUADS; 1049 glBegin GL_QUADS;
1044 glVertex 0 , 0; 1050 glVertex 0 , 0;
1045 glVertex 0 , $h; 1051 glVertex 0 , $h;
1046 glVertex $w, $h; 1052 glVertex $w, $h;
… …
1160 my $dy = $ev->{y} - $oy; 1166 my $dy = $ev->{y} - $oy;
1161 1167
1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1168 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1169 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164 1170
1171 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 $self->realloc; 1172 $self->realloc;
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1167 }; 1173 };
1168 1174
1169 } elsif ($lr ^ $td) { 1175 } elsif ($lr ^ $td) {
1170 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1176 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1171 my ($bx, $by) = ($self->{x}, $self->{y}); 1177 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1174 my ($ev, $x, $y) = @_; 1180 my ($ev, $x, $y) = @_;
1175 1181
1176 ($x, $y) = ($ev->{x}, $ev->{y}); 1182 ($x, $y) = ($ev->{x}, $ev->{y});
1177 1183
1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1184 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1185 # HACK: the next line is required to enforce placement
1186 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1179 }; 1187 };
1180 } else { 1188 } else {
1181 return 0; 1189 return 0;
1182 } 1190 }
1183 1191
… …
1535 1543
1536 delete $self->{texture}; 1544 delete $self->{texture};
1537 $self->SUPER::update; 1545 $self->SUPER::update;
1538} 1546}
1539 1547
1548sub realloc {
1549 my ($self) = @_;
1550
1551 delete $self->{ox};
1552 $self->SUPER::realloc;
1553}
1554
1540sub set_text { 1555sub set_text {
1541 my ($self, $text) = @_; 1556 my ($self, $text) = @_;
1542 1557
1543 return if $self->{text} eq "T$text"; 1558 return if $self->{text} eq "T$text";
1544 $self->{text} = "T$text"; 1559 $self->{text} = "T$text";
1545 1560
1546 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1561 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1547 $self->{layout}->set_text ($text); 1562 $self->{layout}->set_text ($text);
1548 1563
1564 delete $self->{req_h};
1549 $self->realloc; 1565 $self->realloc;
1550 $self->update; 1566 $self->update;
1551} 1567}
1552 1568
1553sub set_markup { 1569sub set_markup {
… …
1559 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1575 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1560 1576
1561 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1577 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1562 $self->{layout}->set_markup ($markup); 1578 $self->{layout}->set_markup ($markup);
1563 1579
1580 delete $self->{req_h};
1564 $self->realloc; 1581 $self->realloc;
1565 $self->update; 1582 $self->update;
1566} 1583}
1567 1584
1568sub size_request { 1585sub size_request {
1569 my ($self) = @_; 1586 my ($self) = @_;
1570 1587
1588 if (exists $self->{req_h}) {
1589 @$self{qw(req_w req_h)}
1590 } else {
1571 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1591 $self->{layout}->set_font ($self->{font}) if $self->{font};
1572 $self->{layout}->set_width ($self->{max_w} || -1); 1592 $self->{layout}->set_width ($self->{max_w} || -1);
1573 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1593 $self->{layout}->set_ellipsise ($self->{ellipsise});
1574 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1594 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1576 1596
1577 my ($w, $h) = $self->{layout}->size; 1597 my ($w, $h) = $self->{layout}->size;
1578 1598
1579 if (exists $self->{template}) { 1599 if (exists $self->{template}) {
1580 $self->{template}->set_font ($self->{font}) if $self->{font}; 1600 $self->{template}->set_font ($self->{font}) if $self->{font};
1581 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1601 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1582 1602
1583 my ($w2, $h2) = $self->{template}->size; 1603 my ($w2, $h2) = $self->{template}->size;
1584 1604
1585 $w = List::Util::max $w, $w2; 1605 $w = List::Util::max $w, $w2;
1586 $h = List::Util::max $h, $h2; 1606 $h = List::Util::max $h, $h2;
1587 } 1607 }
1588 1608
1589 ($w, $h) 1609 ($w, $h)
1610 }
1590} 1611}
1591 1612
1592sub size_allocate { 1613sub size_allocate {
1593 my ($self, $w, $h) = @_; 1614 my ($self, $w, $h) = @_;
1594 1615
… …
1632 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1653 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1633 : ($self->{h} - $tex->{h}) * 0.5); 1654 : ($self->{h} - $tex->{h}) * 0.5);
1634 }; 1655 };
1635 1656
1636 glEnable GL_TEXTURE_2D; 1657 glEnable GL_TEXTURE_2D;
1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1638 1658
1639 if ($tex->{format} == GL_ALPHA) { 1659 if ($tex->{format} == GL_ALPHA) {
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1640 glColor @{$self->{fg}}; 1661 glColor @{$self->{fg}};
1641 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1662 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1642 } else { 1663 } else {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1665 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1644 } 1666 }
1645 1667
1646 glDisable GL_TEXTURE_2D; 1668 glDisable GL_TEXTURE_2D;
1647} 1669}
… …
1681 $self->{last_activity} = $::NOW; 1703 $self->{last_activity} = $::NOW;
1682 $self->{text} = $text; 1704 $self->{text} = $text;
1683 1705
1684 $text =~ s/./*/g if $self->{hidden}; 1706 $text =~ s/./*/g if $self->{hidden};
1685 $self->{layout}->set_text ("$text "); 1707 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h};
1686 1709
1687 $self->_emit (changed => $self->{text}); 1710 $self->_emit (changed => $self->{text});
1711
1712 $self->realloc;
1688 $self->update; 1713 $self->update;
1689} 1714}
1690 1715
1691sub set_text { 1716sub set_text {
1692 my ($self, $text) = @_; 1717 my ($self, $text) = @_;
1693 1718
1694 $self->{cursor} = length $text; 1719 $self->{cursor} = length $text;
1695 $self->_set_text ($text); 1720 $self->_set_text ($text);
1696
1697 $self->realloc;
1698} 1721}
1699 1722
1700sub get_text { 1723sub get_text {
1701 $_[0]{text} 1724 $_[0]{text}
1702} 1725}
… …
1782 my ($self) = @_; 1805 my ($self) = @_;
1783 1806
1784 local $self->{fg} = $self->{fg}; 1807 local $self->{fg} = $self->{fg};
1785 1808
1786 if ($FOCUS == $self) { 1809 if ($FOCUS == $self) {
1787 glColor @{$self->{active_bg}}; 1810 glColor_premultiply @{$self->{active_bg}};
1788 $self->{fg} = $self->{active_fg}; 1811 $self->{fg} = $self->{active_fg};
1789 } else { 1812 } else {
1790 glColor @{$self->{bg}}; 1813 glColor_premultiply @{$self->{bg}};
1791 } 1814 }
1792 1815
1793 glEnable GL_BLEND; 1816 glEnable GL_BLEND;
1794 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1817 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1795 glBegin GL_QUADS; 1818 glBegin GL_QUADS;
1796 glVertex 0 , 0; 1819 glVertex 0 , 0;
1797 glVertex 0 , $self->{h}; 1820 glVertex 0 , $self->{h};
1798 glVertex $self->{w}, $self->{h}; 1821 glVertex $self->{w}, $self->{h};
1799 glVertex $self->{w}, 0; 1822 glVertex $self->{w}, 0;
… …
1909} 1932}
1910 1933
1911sub _draw { 1934sub _draw {
1912 my ($self) = @_; 1935 my ($self) = @_;
1913 1936
1914 local $self->{fg} = $self->{fg}; 1937 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1915
1916 if ($GRAB == $self) {
1917 $self->{fg} = $self->{active_fg};
1918 }
1919 1938
1920 glEnable GL_TEXTURE_2D; 1939 glEnable GL_TEXTURE_2D;
1921 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1940 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1922 glColor 0, 0, 0, 1; 1941 glColor 0, 0, 0, 1;
1923 1942
… …
2148 2167
2149 my $h1 = $self->{h} * (1 - $ycut1); 2168 my $h1 = $self->{h} * (1 - $ycut1);
2150 my $h2 = $self->{h} * (1 - $ycut2); 2169 my $h2 = $self->{h} * (1 - $ycut2);
2151 2170
2152 glEnable GL_BLEND; 2171 glEnable GL_BLEND;
2153 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2172 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2173 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2154 glEnable GL_TEXTURE_2D; 2174 glEnable GL_TEXTURE_2D;
2155 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2175 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2156 2176
2157 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2177 glBindTexture GL_TEXTURE_2D, $t1->{name};
2158 glBegin GL_QUADS; 2178 glBegin GL_QUADS;
… …
2570 2590
2571 delete $self->{texture}; 2591 delete $self->{texture};
2572 } 2592 }
2573 2593
2574 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2594 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2575 glClearColor 0.5, 0.5, 0.5, 0; 2595 glClearColor 0, 0, 0, 0;
2576 glClear GL_COLOR_BUFFER_BIT; 2596 glClear GL_COLOR_BUFFER_BIT;
2577 2597
2578 my $top = int $self->{children}[1]{range}[0]; 2598 my $top = int $self->{children}[1]{range}[0];
2579 2599
2580 my $y0 = $top; 2600 my $y0 = $top;
… …
2615sub _draw { 2635sub _draw {
2616 my ($self) = @_; 2636 my ($self) = @_;
2617 2637
2618 glEnable GL_TEXTURE_2D; 2638 glEnable GL_TEXTURE_2D;
2619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2620 glColor 1, 1, 1, 1; 2640 glColor 0, 0, 0, 1;
2621 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2641 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2622 glDisable GL_TEXTURE_2D; 2642 glDisable GL_TEXTURE_2D;
2623 2643
2624 $self->{children}[1]->draw; 2644 $self->{children}[1]->draw;
2625 2645
2626} 2646}
… …
2853 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2873 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2854 2874
2855 if ($tex) { 2875 if ($tex) {
2856 glEnable GL_TEXTURE_2D; 2876 glEnable GL_TEXTURE_2D;
2857 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2877 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2858 glColor 1, 1, 1, 1; 2878 glColor 0, 0, 0, 1;
2859 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2879 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2860 glDisable GL_TEXTURE_2D; 2880 glDisable GL_TEXTURE_2D;
2861 } 2881 }
2862} 2882}
2863 2883
… …
3071our @ISA = CFClient::UI::VBox::; 3091our @ISA = CFClient::UI::VBox::;
3072 3092
3073sub new { 3093sub new {
3074 my $class = shift; 3094 my $class = shift;
3075 3095
3076 $class->SUPER::new ( 3096 my $self = $class->SUPER::new (
3077 fontsize => 0.8, 3097 fontsize => 0.8,
3078 @_, 3098 @_,
3079 ) 3099 );
3100
3101 Scalar::Util::weaken (my $this = $self);
3102
3103 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3104
3105 $self
3080} 3106}
3081 3107
3082sub reorder { 3108sub reorder {
3083 my ($self) = @_; 3109 my ($self) = @_;
3084 my $NOW = time; 3110 my $NOW = Time::HiRes::time;
3111
3112 # freeze display when hovering over any label
3113 return if $CFClient::UI::TOOLTIP->{owner}
3114 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3115 values %{ $self->{item} };
3085 3116
3086 while (my ($k, $v) = each %{ $self->{item} }) { 3117 while (my ($k, $v) = each %{ $self->{item} }) {
3087 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3118 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3088 } 3119 }
3089 3120
… …
3092 my @items = sort { 3123 my @items = sort {
3093 $a->{pri} <=> $b->{pri} 3124 $a->{pri} <=> $b->{pri}
3094 or $b->{id} <=> $a->{id} 3125 or $b->{id} <=> $a->{id}
3095 } values %{ $self->{item} }; 3126 } values %{ $self->{item} };
3096 3127
3128 $self->{timer}->interval (1);
3129
3097 my $count = 10 + 1; 3130 my $count = 10 + 1;
3098 for my $item (@items) { 3131 for my $item (@items) {
3099 last unless --$count; 3132 last unless --$count;
3100 3133
3101 push @widgets, $item->{label} ||= do { 3134 my $label = $item->{label} ||= do {
3102 # TODO: doesn't handle markup well (read as: at all) 3135 # TODO: doesn't handle markup well (read as: at all)
3103 my $short = $item->{count} > 1 3136 my $short = $item->{count} > 1
3104 ? "<b>$item->{count} ×</b> $item->{text}" 3137 ? "<b>$item->{count} ×</b> $item->{text}"
3105 : $item->{text}; 3138 : $item->{text};
3106 3139
… …
3114 tooltip => $item->{tooltip}, 3147 tooltip => $item->{tooltip},
3115 tooltip_font => $::FONT_PROP, 3148 tooltip_font => $::FONT_PROP,
3116 tooltip_width => 0.67, 3149 tooltip_width => 0.67,
3117 fontsize => $item->{fontsize} || $self->{fontsize}, 3150 fontsize => $item->{fontsize} || $self->{fontsize},
3118 max_w => $::WIDTH * 0.44, 3151 max_w => $::WIDTH * 0.44,
3119 fg => $item->{fg}, 3152 fg => [@{ $item->{fg} }],
3120 can_events => 1, 3153 can_events => 1,
3121 can_hover => 1 3154 can_hover => 1
3122 }; 3155 };
3156
3157 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3158 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3159 $label->update;
3160 $label->set_max_size (undef, $label->{req_h} * $diff)
3161 if $diff < 1;
3162 $self->{timer}->interval (1/30);
3163 } else {
3164 $label->{fg}[3] = $item->{fg}[3] || 1;
3165 }
3166
3167 push @widgets, $label;
3123 } 3168 }
3124 3169
3125 $self->clear; 3170 $self->clear;
3126 $self->SUPER::add (reverse @widgets); 3171 $self->SUPER::add (reverse @widgets);
3127} 3172}
… …
3132 $text =~ s/^\s+//; 3177 $text =~ s/^\s+//;
3133 $text =~ s/\s+$//; 3178 $text =~ s/\s+$//;
3134 3179
3135 return unless $text; 3180 return unless $text;
3136 3181
3137 my $timeout = time + ((delete $arg{timeout}) || 60); 3182 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3138 3183
3139 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3184 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3140 3185
3141 if (my $item = $self->{item}{$group}) { 3186 if (my $item = $self->{item}{$group}) {
3142 if ($item->{text} eq $text) { 3187 if ($item->{text} eq $text) {
… …
3172 3217
3173 $self->reorder; 3218 $self->reorder;
3174 $self->SUPER::reconfigure; 3219 $self->SUPER::reconfigure;
3175} 3220}
3176 3221
3222sub DESTROY {
3223 my ($self) = @_;
3224
3225 $self->{timer}->cancel;
3226
3227 $self->SUPER::DESTROY;
3228}
3229
3177############################################################################# 3230#############################################################################
3178 3231
3179package CFClient::UI::Inventory; 3232package CFClient::UI::Inventory;
3180 3233
3181our @ISA = CFClient::UI::ScrolledWindow::; 3234our @ISA = CFClient::UI::ScrolledWindow::;
… …
3473 3526
3474package CFClient::UI::Root; 3527package CFClient::UI::Root;
3475 3528
3476our @ISA = CFClient::UI::Container::; 3529our @ISA = CFClient::UI::Container::;
3477 3530
3531use List::Util qw(min max);
3532
3478use CFClient::OpenGL; 3533use CFClient::OpenGL;
3479 3534
3480sub new { 3535sub new {
3481 my $class = shift; 3536 my $class = shift;
3482 3537
… …
3616 3671
3617 delete $queue{$widget+0}; 3672 delete $queue{$widget+0};
3618 3673
3619 my ($w, $h) = $widget->size_request; 3674 my ($w, $h) = $widget->size_request;
3620 3675
3621 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3676 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3622 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3677 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3678
3679 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3680 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3623 3681
3624 $w = $widget->{force_w} if exists $widget->{force_w}; 3682 $w = $widget->{force_w} if exists $widget->{force_w};
3625 $h = $widget->{force_h} if exists $widget->{force_h}; 3683 $h = $widget->{force_h} if exists $widget->{force_h};
3626 3684
3627 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3685 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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