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.277 by root, Sun Jun 4 00:21:52 2006 UTC vs.
Revision 1.289 by root, Mon Jun 5 21:43:56 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 {
… …
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 553
551 glPushMatrix; 554 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
553 $self->_draw;
554 glPopMatrix;
555 556
556 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
557 my ($x, $y) = @$self{qw(x y)};
558
559 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
560 glEnable GL_BLEND; 559 glEnable GL_BLEND;
561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562 glBegin GL_QUADS; 561 glBegin GL_QUADS;
563 glVertex $x , $y; 562 glVertex 0 , 0;
564 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
565 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
566 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
567 glEnd; 566 glEnd;
568 glDisable GL_BLEND; 567 glDisable GL_BLEND;
569 } 568 }
570 569
571 if ($ENV{CFPLUS_DEBUG} & 1) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
572 glPushMatrix; 571 glPushMatrix;
573 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
575 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
576 glVertex 0 , 0; 575 glVertex 0 , 0;
577 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
578 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
579 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
580 glEnd; 579 glEnd;
581 glPopMatrix; 580 glPopMatrix;
582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
583 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
584} 586}
585 587
586sub _draw { 588sub _draw {
587 my ($self) = @_; 589 my ($self) = @_;
588 590
… …
626 628
627 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
628 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
629 631
630 glEnable GL_BLEND; 632 glEnable GL_BLEND;
631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632 glColor @$color; 634 glColor_premultiply @$color;
633 635
634 glBegin GL_QUADS; 636 glBegin GL_QUADS;
635 glVertex 0 , 0; 637 glVertex 0 , 0;
636 glVertex 0 , $h; 638 glVertex 0 , $h;
637 glVertex $w, $h; 639 glVertex $w, $h;
… …
856 my $tex = $self->{texture} 858 my $tex = $self->{texture}
857 or return; 859 or return;
858 860
859 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
861 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
862 864
863 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
864 866
865 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
866} 868}
… …
1035 1037
1036 if ($self->{bg}) { 1038 if ($self->{bg}) {
1037 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
1038 1040
1039 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
1040 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1041 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
1042 1044
1043 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
1044 glVertex 0 , 0; 1046 glVertex 0 , 0;
1045 glVertex 0 , $h; 1047 glVertex 0 , $h;
1046 glVertex $w, $h; 1048 glVertex $w, $h;
… …
1537 1539
1538 delete $self->{texture}; 1540 delete $self->{texture};
1539 $self->SUPER::update; 1541 $self->SUPER::update;
1540} 1542}
1541 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1542sub set_text { 1551sub set_text {
1543 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1544 1553
1545 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1546 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1547 1556
1548 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1549 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1550 1559
1560 delete $self->{size_req};
1551 $self->realloc; 1561 $self->realloc;
1552 $self->update; 1562 $self->update;
1553} 1563}
1554 1564
1555sub set_markup { 1565sub set_markup {
… …
1561 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1562 1572
1563 $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;
1564 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1565 1575
1576 delete $self->{size_req};
1566 $self->realloc; 1577 $self->realloc;
1567 $self->update; 1578 $self->update;
1568} 1579}
1569 1580
1570sub size_request { 1581sub size_request {
1571 my ($self) = @_; 1582 my ($self) = @_;
1572 1583
1584 $self->{size_req} ||= do {
1573 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1574 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1575 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1576 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1577 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1578 1590
1579 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1580 1592
1581 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1582 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1583 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1584 1596
1585 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1586 1598
1587 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1588 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1589 } 1604 };
1590 1605
1591 ($w, $h) 1606 @{ $self->{size_req} }
1592} 1607}
1593 1608
1594sub size_allocate { 1609sub size_allocate {
1595 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1596 1611
… …
1605 1620
1606 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1607 delete $self->{texture}; 1622 delete $self->{texture};
1608 1623
1609 $self->realloc; 1624 $self->realloc;
1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1610} 1633}
1611 1634
1612sub _draw { 1635sub _draw {
1613 my ($self) = @_; 1636 my ($self) = @_;
1614 1637
… …
1634 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1635 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1636 }; 1659 };
1637 1660
1638 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1640 1662
1641 if ($tex->{format} == GL_ALPHA) { 1663 if ($tex->{format} == GL_ALPHA) {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1642 glColor @{$self->{fg}}; 1665 glColor @{$self->{fg}};
1643 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1644 } else { 1667 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1646 } 1670 }
1647 1671
1648 glDisable GL_TEXTURE_2D; 1672 glDisable GL_TEXTURE_2D;
1649} 1673}
… …
1683 $self->{last_activity} = $::NOW; 1707 $self->{last_activity} = $::NOW;
1684 $self->{text} = $text; 1708 $self->{text} = $text;
1685 1709
1686 $text =~ s/./*/g if $self->{hidden}; 1710 $text =~ s/./*/g if $self->{hidden};
1687 $self->{layout}->set_text ("$text "); 1711 $self->{layout}->set_text ("$text ");
1712 delete $self->{size_req};
1688 1713
1689 $self->_emit (changed => $self->{text}); 1714 $self->_emit (changed => $self->{text});
1715
1716 $self->realloc;
1690 $self->update; 1717 $self->update;
1691} 1718}
1692 1719
1693sub set_text { 1720sub set_text {
1694 my ($self, $text) = @_; 1721 my ($self, $text) = @_;
1695 1722
1696 $self->{cursor} = length $text; 1723 $self->{cursor} = length $text;
1697 $self->_set_text ($text); 1724 $self->_set_text ($text);
1698
1699 $self->realloc;
1700} 1725}
1701 1726
1702sub get_text { 1727sub get_text {
1703 $_[0]{text} 1728 $_[0]{text}
1704} 1729}
… …
1784 my ($self) = @_; 1809 my ($self) = @_;
1785 1810
1786 local $self->{fg} = $self->{fg}; 1811 local $self->{fg} = $self->{fg};
1787 1812
1788 if ($FOCUS == $self) { 1813 if ($FOCUS == $self) {
1789 glColor @{$self->{active_bg}}; 1814 glColor_premultiply @{$self->{active_bg}};
1790 $self->{fg} = $self->{active_fg}; 1815 $self->{fg} = $self->{active_fg};
1791 } else { 1816 } else {
1792 glColor @{$self->{bg}}; 1817 glColor_premultiply @{$self->{bg}};
1793 } 1818 }
1794 1819
1795 glEnable GL_BLEND; 1820 glEnable GL_BLEND;
1796 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1821 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1797 glBegin GL_QUADS; 1822 glBegin GL_QUADS;
1798 glVertex 0 , 0; 1823 glVertex 0 , 0;
1799 glVertex 0 , $self->{h}; 1824 glVertex 0 , $self->{h};
1800 glVertex $self->{w}, $self->{h}; 1825 glVertex $self->{w}, $self->{h};
1801 glVertex $self->{w}, 0; 1826 glVertex $self->{w}, 0;
… …
1911} 1936}
1912 1937
1913sub _draw { 1938sub _draw {
1914 my ($self) = @_; 1939 my ($self) = @_;
1915 1940
1916 local $self->{fg} = $self->{fg}; 1941 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1917
1918 if ($GRAB == $self) {
1919 $self->{fg} = $self->{active_fg};
1920 }
1921 1942
1922 glEnable GL_TEXTURE_2D; 1943 glEnable GL_TEXTURE_2D;
1923 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1944 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1924 glColor 0, 0, 0, 1; 1945 glColor 0, 0, 0, 1;
1925 1946
… …
2150 2171
2151 my $h1 = $self->{h} * (1 - $ycut1); 2172 my $h1 = $self->{h} * (1 - $ycut1);
2152 my $h2 = $self->{h} * (1 - $ycut2); 2173 my $h2 = $self->{h} * (1 - $ycut2);
2153 2174
2154 glEnable GL_BLEND; 2175 glEnable GL_BLEND;
2155 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2176 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2177 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2156 glEnable GL_TEXTURE_2D; 2178 glEnable GL_TEXTURE_2D;
2157 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2179 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2158 2180
2159 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2181 glBindTexture GL_TEXTURE_2D, $t1->{name};
2160 glBegin GL_QUADS; 2182 glBegin GL_QUADS;
… …
2572 2594
2573 delete $self->{texture}; 2595 delete $self->{texture};
2574 } 2596 }
2575 2597
2576 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2598 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2577 glClearColor 0.5, 0.5, 0.5, 0; 2599 glClearColor 0, 0, 0, 0;
2578 glClear GL_COLOR_BUFFER_BIT; 2600 glClear GL_COLOR_BUFFER_BIT;
2579 2601
2580 my $top = int $self->{children}[1]{range}[0]; 2602 my $top = int $self->{children}[1]{range}[0];
2581 2603
2582 my $y0 = $top; 2604 my $y0 = $top;
… …
2617sub _draw { 2639sub _draw {
2618 my ($self) = @_; 2640 my ($self) = @_;
2619 2641
2620 glEnable GL_TEXTURE_2D; 2642 glEnable GL_TEXTURE_2D;
2621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2622 glColor 1, 1, 1, 1; 2644 glColor 0, 0, 0, 1;
2623 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2645 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2624 glDisable GL_TEXTURE_2D; 2646 glDisable GL_TEXTURE_2D;
2625 2647
2626 $self->{children}[1]->draw; 2648 $self->{children}[1]->draw;
2627 2649
2628} 2650}
… …
2855 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2877 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2856 2878
2857 if ($tex) { 2879 if ($tex) {
2858 glEnable GL_TEXTURE_2D; 2880 glEnable GL_TEXTURE_2D;
2859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2881 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2860 glColor 1, 1, 1, 1; 2882 glColor 0, 0, 0, 1;
2861 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2883 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2862 glDisable GL_TEXTURE_2D; 2884 glDisable GL_TEXTURE_2D;
2863 } 2885 }
2864} 2886}
2865 2887
… …
3073our @ISA = CFClient::UI::VBox::; 3095our @ISA = CFClient::UI::VBox::;
3074 3096
3075sub new { 3097sub new {
3076 my $class = shift; 3098 my $class = shift;
3077 3099
3078 $class->SUPER::new ( 3100 my $self = $class->SUPER::new (
3079 fontsize => 0.8, 3101 fontsize => 0.8,
3080 @_, 3102 @_,
3081 ) 3103 );
3104
3105 Scalar::Util::weaken (my $this = $self);
3106
3107 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3108
3109 $self
3082} 3110}
3083 3111
3084sub reorder { 3112sub reorder {
3085 my ($self) = @_; 3113 my ($self) = @_;
3086 my $NOW = time; 3114 my $NOW = Time::HiRes::time;
3115
3116 # freeze display when hovering over any label
3117 return if $CFClient::UI::TOOLTIP->{owner}
3118 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3119 values %{ $self->{item} };
3087 3120
3088 while (my ($k, $v) = each %{ $self->{item} }) { 3121 while (my ($k, $v) = each %{ $self->{item} }) {
3089 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3122 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3090 } 3123 }
3091 3124
… …
3094 my @items = sort { 3127 my @items = sort {
3095 $a->{pri} <=> $b->{pri} 3128 $a->{pri} <=> $b->{pri}
3096 or $b->{id} <=> $a->{id} 3129 or $b->{id} <=> $a->{id}
3097 } values %{ $self->{item} }; 3130 } values %{ $self->{item} };
3098 3131
3132 $self->{timer}->interval (1);
3133
3099 my $count = 10 + 1; 3134 my $count = 10 + 1;
3100 for my $item (@items) { 3135 for my $item (@items) {
3101 last unless --$count; 3136 last unless --$count;
3102 3137
3103 push @widgets, $item->{label} ||= do { 3138 my $label = $item->{label} ||= do {
3104 # TODO: doesn't handle markup well (read as: at all) 3139 # TODO: doesn't handle markup well (read as: at all)
3105 my $short = $item->{count} > 1 3140 my $short = $item->{count} > 1
3106 ? "<b>$item->{count} ×</b> $item->{text}" 3141 ? "<b>$item->{count} ×</b> $item->{text}"
3107 : $item->{text}; 3142 : $item->{text};
3108 3143
… …
3116 tooltip => $item->{tooltip}, 3151 tooltip => $item->{tooltip},
3117 tooltip_font => $::FONT_PROP, 3152 tooltip_font => $::FONT_PROP,
3118 tooltip_width => 0.67, 3153 tooltip_width => 0.67,
3119 fontsize => $item->{fontsize} || $self->{fontsize}, 3154 fontsize => $item->{fontsize} || $self->{fontsize},
3120 max_w => $::WIDTH * 0.44, 3155 max_w => $::WIDTH * 0.44,
3121 fg => $item->{fg}, 3156 fg => [@{ $item->{fg} }],
3122 can_events => 1, 3157 can_events => 1,
3123 can_hover => 1 3158 can_hover => 1
3124 }; 3159 };
3160
3161 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3162 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3163 $label->update;
3164 $label->set_max_size (undef, $label->{req_h} * $diff)
3165 if $diff < 1;
3166 $self->{timer}->interval (1/30);
3167 } else {
3168 $label->{fg}[3] = $item->{fg}[3] || 1;
3169 }
3170
3171 push @widgets, $label;
3125 } 3172 }
3126 3173
3127 $self->clear; 3174 $self->clear;
3128 $self->SUPER::add (reverse @widgets); 3175 $self->SUPER::add (reverse @widgets);
3129} 3176}
… …
3134 $text =~ s/^\s+//; 3181 $text =~ s/^\s+//;
3135 $text =~ s/\s+$//; 3182 $text =~ s/\s+$//;
3136 3183
3137 return unless $text; 3184 return unless $text;
3138 3185
3139 my $timeout = time + ((delete $arg{timeout}) || 60); 3186 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3140 3187
3141 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3188 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3142 3189
3143 if (my $item = $self->{item}{$group}) { 3190 if (my $item = $self->{item}{$group}) {
3144 if ($item->{text} eq $text) { 3191 if ($item->{text} eq $text) {
… …
3174 3221
3175 $self->reorder; 3222 $self->reorder;
3176 $self->SUPER::reconfigure; 3223 $self->SUPER::reconfigure;
3177} 3224}
3178 3225
3226sub DESTROY {
3227 my ($self) = @_;
3228
3229 $self->{timer}->cancel;
3230
3231 $self->SUPER::DESTROY;
3232}
3233
3179############################################################################# 3234#############################################################################
3180 3235
3181package CFClient::UI::Inventory; 3236package CFClient::UI::Inventory;
3182 3237
3183our @ISA = CFClient::UI::ScrolledWindow::; 3238our @ISA = CFClient::UI::ScrolledWindow::;
… …
3475 3530
3476package CFClient::UI::Root; 3531package CFClient::UI::Root;
3477 3532
3478our @ISA = CFClient::UI::Container::; 3533our @ISA = CFClient::UI::Container::;
3479 3534
3535use List::Util qw(min max);
3536
3480use CFClient::OpenGL; 3537use CFClient::OpenGL;
3481 3538
3482sub new { 3539sub new {
3483 my $class = shift; 3540 my $class = shift;
3484 3541
… …
3618 3675
3619 delete $queue{$widget+0}; 3676 delete $queue{$widget+0};
3620 3677
3621 my ($w, $h) = $widget->size_request; 3678 my ($w, $h) = $widget->size_request;
3622 3679
3623 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3680 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3624 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3681 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3682
3683 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3684 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3625 3685
3626 $w = $widget->{force_w} if exists $widget->{force_w}; 3686 $w = $widget->{force_w} if exists $widget->{force_w};
3627 $h = $widget->{force_h} if exists $widget->{force_h}; 3687 $h = $widget->{force_h} if exists $widget->{force_h};
3628 3688
3629 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3689 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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