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.284 by root, Mon Jun 5 03:06:04 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 return if $ENV{CFPLUS_DEBUG} & 8;
24
25 if (!$GRAB) {
26 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
27 if (length $widget->{tooltip}) {
28 if ($TOOLTIP->{owner} != $widget) {
29 $TOOLTIP->hide;
30
31 $TOOLTIP->{owner} = $widget;
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;
… …
1160 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1161 1163
1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164 1166
1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 $self->realloc; 1168 $self->realloc;
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1167 }; 1169 };
1168 1170
1169 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1170 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1171 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1174 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1175 1177
1176 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1177 1179
1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1179 }; 1183 };
1180 } else { 1184 } else {
1181 return 0; 1185 return 0;
1182 } 1186 }
1183 1187
… …
1535 1539
1536 delete $self->{texture}; 1540 delete $self->{texture};
1537 $self->SUPER::update; 1541 $self->SUPER::update;
1538} 1542}
1539 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1540sub set_text { 1551sub set_text {
1541 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1542 1553
1543 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1544 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1545 1556
1546 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1547 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1559 delete $self->{req_h};
1548 1560
1549 $self->realloc; 1561 $self->realloc;
1550 $self->update; 1562 $self->update;
1551} 1563}
1552 1564
… …
1558 1570
1559 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1560 1572
1561 $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;
1562 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1575 delete $self->{req_h};
1563 1576
1564 $self->realloc; 1577 $self->realloc;
1565 $self->update; 1578 $self->update;
1566} 1579}
1567 1580
1568sub size_request { 1581sub size_request {
1569 my ($self) = @_; 1582 my ($self) = @_;
1570 1583
1584 if (exists $self->{req_h}) {
1585 @$self{qw(req_w req_h)}
1586 } else {
1571 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1587 $self->{layout}->set_font ($self->{font}) if $self->{font};
1572 $self->{layout}->set_width ($self->{max_w} || -1); 1588 $self->{layout}->set_width ($self->{max_w} || -1);
1573 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1589 $self->{layout}->set_ellipsise ($self->{ellipsise});
1574 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1576 1592
1577 my ($w, $h) = $self->{layout}->size; 1593 my ($w, $h) = $self->{layout}->size;
1578 1594
1579 if (exists $self->{template}) { 1595 if (exists $self->{template}) {
1580 $self->{template}->set_font ($self->{font}) if $self->{font}; 1596 $self->{template}->set_font ($self->{font}) if $self->{font};
1581 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1582 1598
1583 my ($w2, $h2) = $self->{template}->size; 1599 my ($w2, $h2) = $self->{template}->size;
1584 1600
1585 $w = List::Util::max $w, $w2; 1601 $w = List::Util::max $w, $w2;
1586 $h = List::Util::max $h, $h2; 1602 $h = List::Util::max $h, $h2;
1587 } 1603 }
1588 1604
1589 ($w, $h) 1605 ($w, $h)
1606 }
1590} 1607}
1591 1608
1592sub size_allocate { 1609sub size_allocate {
1593 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1594 1611
… …
1634 }; 1651 };
1635 1652
1636 glEnable GL_TEXTURE_2D; 1653 glEnable GL_TEXTURE_2D;
1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1638 1655
1656 glColor_premultiply @{$self->{fg}}
1639 if ($tex->{format} == GL_ALPHA) { 1657 if $tex->{format} == GL_ALPHA;
1640 glColor @{$self->{fg}}; 1658
1641 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1642 } else {
1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1659 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1644 }
1645 1660
1646 glDisable GL_TEXTURE_2D; 1661 glDisable GL_TEXTURE_2D;
1647} 1662}
1648 1663
1649############################################################################# 1664#############################################################################
… …
1681 $self->{last_activity} = $::NOW; 1696 $self->{last_activity} = $::NOW;
1682 $self->{text} = $text; 1697 $self->{text} = $text;
1683 1698
1684 $text =~ s/./*/g if $self->{hidden}; 1699 $text =~ s/./*/g if $self->{hidden};
1685 $self->{layout}->set_text ("$text "); 1700 $self->{layout}->set_text ("$text ");
1701 delete $self->{req_h};
1686 1702
1687 $self->_emit (changed => $self->{text}); 1703 $self->_emit (changed => $self->{text});
1704
1705 $self->realloc;
1688 $self->update; 1706 $self->update;
1689} 1707}
1690 1708
1691sub set_text { 1709sub set_text {
1692 my ($self, $text) = @_; 1710 my ($self, $text) = @_;
1693 1711
1694 $self->{cursor} = length $text; 1712 $self->{cursor} = length $text;
1695 $self->_set_text ($text); 1713 $self->_set_text ($text);
1696
1697 $self->realloc;
1698} 1714}
1699 1715
1700sub get_text { 1716sub get_text {
1701 $_[0]{text} 1717 $_[0]{text}
1702} 1718}
… …
1782 my ($self) = @_; 1798 my ($self) = @_;
1783 1799
1784 local $self->{fg} = $self->{fg}; 1800 local $self->{fg} = $self->{fg};
1785 1801
1786 if ($FOCUS == $self) { 1802 if ($FOCUS == $self) {
1787 glColor @{$self->{active_bg}}; 1803 glColor_premultiply @{$self->{active_bg}};
1788 $self->{fg} = $self->{active_fg}; 1804 $self->{fg} = $self->{active_fg};
1789 } else { 1805 } else {
1790 glColor @{$self->{bg}}; 1806 glColor_premultiply @{$self->{bg}};
1791 } 1807 }
1792 1808
1793 glEnable GL_BLEND; 1809 glEnable GL_BLEND;
1794 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1810 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1795 glBegin GL_QUADS; 1811 glBegin GL_QUADS;
1796 glVertex 0 , 0; 1812 glVertex 0 , 0;
1797 glVertex 0 , $self->{h}; 1813 glVertex 0 , $self->{h};
1798 glVertex $self->{w}, $self->{h}; 1814 glVertex $self->{w}, $self->{h};
1799 glVertex $self->{w}, 0; 1815 glVertex $self->{w}, 0;
… …
1909} 1925}
1910 1926
1911sub _draw { 1927sub _draw {
1912 my ($self) = @_; 1928 my ($self) = @_;
1913 1929
1914 local $self->{fg} = $self->{fg}; 1930 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1915
1916 if ($GRAB == $self) {
1917 $self->{fg} = $self->{active_fg};
1918 }
1919 1931
1920 glEnable GL_TEXTURE_2D; 1932 glEnable GL_TEXTURE_2D;
1921 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1933 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1922 glColor 0, 0, 0, 1; 1934 glColor 0, 0, 0, 1;
1923 1935
… …
2148 2160
2149 my $h1 = $self->{h} * (1 - $ycut1); 2161 my $h1 = $self->{h} * (1 - $ycut1);
2150 my $h2 = $self->{h} * (1 - $ycut2); 2162 my $h2 = $self->{h} * (1 - $ycut2);
2151 2163
2152 glEnable GL_BLEND; 2164 glEnable GL_BLEND;
2153 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2165 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2166 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2154 glEnable GL_TEXTURE_2D; 2167 glEnable GL_TEXTURE_2D;
2155 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2168 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2156 2169
2157 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2170 glBindTexture GL_TEXTURE_2D, $t1->{name};
2158 glBegin GL_QUADS; 2171 glBegin GL_QUADS;
… …
2570 2583
2571 delete $self->{texture}; 2584 delete $self->{texture};
2572 } 2585 }
2573 2586
2574 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2587 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2575 glClearColor 0.5, 0.5, 0.5, 0; 2588 glClearColor 0, 0, 0, 0;
2576 glClear GL_COLOR_BUFFER_BIT; 2589 glClear GL_COLOR_BUFFER_BIT;
2577 2590
2578 my $top = int $self->{children}[1]{range}[0]; 2591 my $top = int $self->{children}[1]{range}[0];
2579 2592
2580 my $y0 = $top; 2593 my $y0 = $top;
… …
2615sub _draw { 2628sub _draw {
2616 my ($self) = @_; 2629 my ($self) = @_;
2617 2630
2618 glEnable GL_TEXTURE_2D; 2631 glEnable GL_TEXTURE_2D;
2619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2632 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2620 glColor 1, 1, 1, 1; 2633 glColor 0, 0, 0, 1;
2621 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2634 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2622 glDisable GL_TEXTURE_2D; 2635 glDisable GL_TEXTURE_2D;
2623 2636
2624 $self->{children}[1]->draw; 2637 $self->{children}[1]->draw;
2625 2638
2626} 2639}
… …
2853 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2866 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2854 2867
2855 if ($tex) { 2868 if ($tex) {
2856 glEnable GL_TEXTURE_2D; 2869 glEnable GL_TEXTURE_2D;
2857 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2870 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2858 glColor 1, 1, 1, 1; 2871 glColor 0, 0, 0, 1;
2859 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2872 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2860 glDisable GL_TEXTURE_2D; 2873 glDisable GL_TEXTURE_2D;
2861 } 2874 }
2862} 2875}
2863 2876
… …
3071our @ISA = CFClient::UI::VBox::; 3084our @ISA = CFClient::UI::VBox::;
3072 3085
3073sub new { 3086sub new {
3074 my $class = shift; 3087 my $class = shift;
3075 3088
3076 $class->SUPER::new ( 3089 my $self = $class->SUPER::new (
3077 fontsize => 0.8, 3090 fontsize => 0.8,
3078 @_, 3091 @_,
3079 ) 3092 );
3093
3094 Scalar::Util::weaken (my $this = $self);
3095
3096 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3097
3098 $self
3080} 3099}
3081 3100
3082sub reorder { 3101sub reorder {
3083 my ($self) = @_; 3102 my ($self) = @_;
3084 my $NOW = time; 3103 my $NOW = Time::HiRes::time;
3104
3105 # freeze display when hovering over any label
3106 return if $CFClient::UI::TOOLTIP->{owner}
3107 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3108 values %{ $self->{item} };
3085 3109
3086 while (my ($k, $v) = each %{ $self->{item} }) { 3110 while (my ($k, $v) = each %{ $self->{item} }) {
3087 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3111 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3088 } 3112 }
3089 3113
… …
3092 my @items = sort { 3116 my @items = sort {
3093 $a->{pri} <=> $b->{pri} 3117 $a->{pri} <=> $b->{pri}
3094 or $b->{id} <=> $a->{id} 3118 or $b->{id} <=> $a->{id}
3095 } values %{ $self->{item} }; 3119 } values %{ $self->{item} };
3096 3120
3121 $self->{timer}->interval (1);
3122
3097 my $count = 10 + 1; 3123 my $count = 10 + 1;
3098 for my $item (@items) { 3124 for my $item (@items) {
3099 last unless --$count; 3125 last unless --$count;
3100 3126
3101 push @widgets, $item->{label} ||= do { 3127 my $label = $item->{label} ||= do {
3102 # TODO: doesn't handle markup well (read as: at all) 3128 # TODO: doesn't handle markup well (read as: at all)
3103 my $short = $item->{count} > 1 3129 my $short = $item->{count} > 1
3104 ? "<b>$item->{count} ×</b> $item->{text}" 3130 ? "<b>$item->{count} ×</b> $item->{text}"
3105 : $item->{text}; 3131 : $item->{text};
3106 3132
… …
3114 tooltip => $item->{tooltip}, 3140 tooltip => $item->{tooltip},
3115 tooltip_font => $::FONT_PROP, 3141 tooltip_font => $::FONT_PROP,
3116 tooltip_width => 0.67, 3142 tooltip_width => 0.67,
3117 fontsize => $item->{fontsize} || $self->{fontsize}, 3143 fontsize => $item->{fontsize} || $self->{fontsize},
3118 max_w => $::WIDTH * 0.44, 3144 max_w => $::WIDTH * 0.44,
3119 fg => $item->{fg}, 3145 fg => [@{ $item->{fg} }],
3120 can_events => 1, 3146 can_events => 1,
3121 can_hover => 1 3147 can_hover => 1
3122 }; 3148 };
3149
3150 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3151 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3152 $label->update;
3153 $label->set_max_size (undef, $label->{req_h} * $diff)
3154 if $diff < 1;
3155 $self->{timer}->interval (1/30);
3156 } else {
3157 $label->{fg}[3] = $item->{fg}[3] || 1;
3158 }
3159
3160 push @widgets, $label;
3123 } 3161 }
3124 3162
3125 $self->clear; 3163 $self->clear;
3126 $self->SUPER::add (reverse @widgets); 3164 $self->SUPER::add (reverse @widgets);
3127} 3165}
… …
3132 $text =~ s/^\s+//; 3170 $text =~ s/^\s+//;
3133 $text =~ s/\s+$//; 3171 $text =~ s/\s+$//;
3134 3172
3135 return unless $text; 3173 return unless $text;
3136 3174
3137 my $timeout = time + ((delete $arg{timeout}) || 60); 3175 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3138 3176
3139 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3177 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3140 3178
3141 if (my $item = $self->{item}{$group}) { 3179 if (my $item = $self->{item}{$group}) {
3142 if ($item->{text} eq $text) { 3180 if ($item->{text} eq $text) {
… …
3172 3210
3173 $self->reorder; 3211 $self->reorder;
3174 $self->SUPER::reconfigure; 3212 $self->SUPER::reconfigure;
3175} 3213}
3176 3214
3215sub DESTROY {
3216 my ($self) = @_;
3217
3218 $self->{timer}->cancel;
3219
3220 $self->SUPER::DESTROY;
3221}
3222
3177############################################################################# 3223#############################################################################
3178 3224
3179package CFClient::UI::Inventory; 3225package CFClient::UI::Inventory;
3180 3226
3181our @ISA = CFClient::UI::ScrolledWindow::; 3227our @ISA = CFClient::UI::ScrolledWindow::;
… …
3473 3519
3474package CFClient::UI::Root; 3520package CFClient::UI::Root;
3475 3521
3476our @ISA = CFClient::UI::Container::; 3522our @ISA = CFClient::UI::Container::;
3477 3523
3524use List::Util qw(min max);
3525
3478use CFClient::OpenGL; 3526use CFClient::OpenGL;
3479 3527
3480sub new { 3528sub new {
3481 my $class = shift; 3529 my $class = shift;
3482 3530
… …
3616 3664
3617 delete $queue{$widget+0}; 3665 delete $queue{$widget+0};
3618 3666
3619 my ($w, $h) = $widget->size_request; 3667 my ($w, $h) = $widget->size_request;
3620 3668
3621 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3669 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3622 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3670 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3671
3672 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3673 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3623 3674
3624 $w = $widget->{force_w} if exists $widget->{force_w}; 3675 $w = $widget->{force_w} if exists $widget->{force_w};
3625 $h = $widget->{force_h} if exists $widget->{force_h}; 3676 $h = $widget->{force_h} if exists $widget->{force_h};
3626 3677
3627 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3678 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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