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.275 by root, Sat Jun 3 22:50:48 2006 UTC vs.
Revision 1.286 by root, Mon Jun 5 03:48:49 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;
… …
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
… …
1676 1693
1677 delete $self->{cur_h}; 1694 delete $self->{cur_h};
1678 1695
1679 return if $self->{text} eq $text; 1696 return if $self->{text} eq $text;
1680 1697
1681 delete $self->{texture};
1682
1683 $self->{last_activity} = $::NOW; 1698 $self->{last_activity} = $::NOW;
1684 $self->{text} = $text; 1699 $self->{text} = $text;
1685 1700
1686 $text =~ s/./*/g if $self->{hidden}; 1701 $text =~ s/./*/g if $self->{hidden};
1687 $self->{layout}->set_text ("$text "); 1702 $self->{layout}->set_text ("$text ");
1703 delete $self->{req_h};
1688 1704
1689 $self->_emit (changed => $self->{text}); 1705 $self->_emit (changed => $self->{text});
1706
1707 $self->realloc;
1708 $self->update;
1690} 1709}
1691 1710
1692sub set_text { 1711sub set_text {
1693 my ($self, $text) = @_; 1712 my ($self, $text) = @_;
1694 1713
1695 $self->{cursor} = length $text; 1714 $self->{cursor} = length $text;
1696 $self->_set_text ($text); 1715 $self->_set_text ($text);
1697
1698 $self->realloc;
1699} 1716}
1700 1717
1701sub get_text { 1718sub get_text {
1702 $_[0]{text} 1719 $_[0]{text}
1703} 1720}
… …
1783 my ($self) = @_; 1800 my ($self) = @_;
1784 1801
1785 local $self->{fg} = $self->{fg}; 1802 local $self->{fg} = $self->{fg};
1786 1803
1787 if ($FOCUS == $self) { 1804 if ($FOCUS == $self) {
1788 glColor @{$self->{active_bg}}; 1805 glColor_premultiply @{$self->{active_bg}};
1789 $self->{fg} = $self->{active_fg}; 1806 $self->{fg} = $self->{active_fg};
1790 } else { 1807 } else {
1791 glColor @{$self->{bg}}; 1808 glColor_premultiply @{$self->{bg}};
1792 } 1809 }
1793 1810
1794 glEnable GL_BLEND; 1811 glEnable GL_BLEND;
1795 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1812 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1796 glBegin GL_QUADS; 1813 glBegin GL_QUADS;
1797 glVertex 0 , 0; 1814 glVertex 0 , 0;
1798 glVertex 0 , $self->{h}; 1815 glVertex 0 , $self->{h};
1799 glVertex $self->{w}, $self->{h}; 1816 glVertex $self->{w}, $self->{h};
1800 glVertex $self->{w}, 0; 1817 glVertex $self->{w}, 0;
… …
1910} 1927}
1911 1928
1912sub _draw { 1929sub _draw {
1913 my ($self) = @_; 1930 my ($self) = @_;
1914 1931
1915 local $self->{fg} = $self->{fg}; 1932 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1916
1917 if ($GRAB == $self) {
1918 $self->{fg} = $self->{active_fg};
1919 }
1920 1933
1921 glEnable GL_TEXTURE_2D; 1934 glEnable GL_TEXTURE_2D;
1922 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1935 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1923 glColor 0, 0, 0, 1; 1936 glColor 0, 0, 0, 1;
1924 1937
… …
2149 2162
2150 my $h1 = $self->{h} * (1 - $ycut1); 2163 my $h1 = $self->{h} * (1 - $ycut1);
2151 my $h2 = $self->{h} * (1 - $ycut2); 2164 my $h2 = $self->{h} * (1 - $ycut2);
2152 2165
2153 glEnable GL_BLEND; 2166 glEnable GL_BLEND;
2154 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2167 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2168 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2155 glEnable GL_TEXTURE_2D; 2169 glEnable GL_TEXTURE_2D;
2156 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2157 2171
2158 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2172 glBindTexture GL_TEXTURE_2D, $t1->{name};
2159 glBegin GL_QUADS; 2173 glBegin GL_QUADS;
… …
2571 2585
2572 delete $self->{texture}; 2586 delete $self->{texture};
2573 } 2587 }
2574 2588
2575 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2589 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2576 glClearColor 0.5, 0.5, 0.5, 0; 2590 glClearColor 0, 0, 0, 0;
2577 glClear GL_COLOR_BUFFER_BIT; 2591 glClear GL_COLOR_BUFFER_BIT;
2578 2592
2579 my $top = int $self->{children}[1]{range}[0]; 2593 my $top = int $self->{children}[1]{range}[0];
2580 2594
2581 my $y0 = $top; 2595 my $y0 = $top;
… …
2616sub _draw { 2630sub _draw {
2617 my ($self) = @_; 2631 my ($self) = @_;
2618 2632
2619 glEnable GL_TEXTURE_2D; 2633 glEnable GL_TEXTURE_2D;
2620 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2634 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2621 glColor 1, 1, 1, 1; 2635 glColor 0, 0, 0, 1;
2622 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2636 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2623 glDisable GL_TEXTURE_2D; 2637 glDisable GL_TEXTURE_2D;
2624 2638
2625 $self->{children}[1]->draw; 2639 $self->{children}[1]->draw;
2626 2640
2627} 2641}
… …
2854 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2868 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2855 2869
2856 if ($tex) { 2870 if ($tex) {
2857 glEnable GL_TEXTURE_2D; 2871 glEnable GL_TEXTURE_2D;
2858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2872 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2859 glColor 1, 1, 1, 1; 2873 glColor 0, 0, 0, 1;
2860 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2874 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2861 glDisable GL_TEXTURE_2D; 2875 glDisable GL_TEXTURE_2D;
2862 } 2876 }
2863} 2877}
2864 2878
… …
3072our @ISA = CFClient::UI::VBox::; 3086our @ISA = CFClient::UI::VBox::;
3073 3087
3074sub new { 3088sub new {
3075 my $class = shift; 3089 my $class = shift;
3076 3090
3077 $class->SUPER::new ( 3091 my $self = $class->SUPER::new (
3078 fontsize => 0.8, 3092 fontsize => 0.8,
3079 @_, 3093 @_,
3080 ) 3094 );
3095
3096 Scalar::Util::weaken (my $this = $self);
3097
3098 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3099
3100 $self
3081} 3101}
3082 3102
3083sub reorder { 3103sub reorder {
3084 my ($self) = @_; 3104 my ($self) = @_;
3085 my $NOW = time; 3105 my $NOW = Time::HiRes::time;
3106
3107 # freeze display when hovering over any label
3108 return if $CFClient::UI::TOOLTIP->{owner}
3109 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3110 values %{ $self->{item} };
3086 3111
3087 while (my ($k, $v) = each %{ $self->{item} }) { 3112 while (my ($k, $v) = each %{ $self->{item} }) {
3088 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3113 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3089 } 3114 }
3090 3115
… …
3093 my @items = sort { 3118 my @items = sort {
3094 $a->{pri} <=> $b->{pri} 3119 $a->{pri} <=> $b->{pri}
3095 or $b->{id} <=> $a->{id} 3120 or $b->{id} <=> $a->{id}
3096 } values %{ $self->{item} }; 3121 } values %{ $self->{item} };
3097 3122
3123 $self->{timer}->interval (1);
3124
3098 my $count = 10 + 1; 3125 my $count = 10 + 1;
3099 for my $item (@items) { 3126 for my $item (@items) {
3100 last unless --$count; 3127 last unless --$count;
3101 3128
3102 push @widgets, $item->{label} ||= do { 3129 my $label = $item->{label} ||= do {
3103 # TODO: doesn't handle markup well (read as: at all) 3130 # TODO: doesn't handle markup well (read as: at all)
3104 my $short = $item->{count} > 1 3131 my $short = $item->{count} > 1
3105 ? "<b>$item->{count} ×</b> $item->{text}" 3132 ? "<b>$item->{count} ×</b> $item->{text}"
3106 : $item->{text}; 3133 : $item->{text};
3107 3134
… …
3115 tooltip => $item->{tooltip}, 3142 tooltip => $item->{tooltip},
3116 tooltip_font => $::FONT_PROP, 3143 tooltip_font => $::FONT_PROP,
3117 tooltip_width => 0.67, 3144 tooltip_width => 0.67,
3118 fontsize => $item->{fontsize} || $self->{fontsize}, 3145 fontsize => $item->{fontsize} || $self->{fontsize},
3119 max_w => $::WIDTH * 0.44, 3146 max_w => $::WIDTH * 0.44,
3120 fg => $item->{fg}, 3147 fg => [@{ $item->{fg} }],
3121 can_events => 1, 3148 can_events => 1,
3122 can_hover => 1 3149 can_hover => 1
3123 }; 3150 };
3151
3152 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3153 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3154 $label->update;
3155 $label->set_max_size (undef, $label->{req_h} * $diff)
3156 if $diff < 1;
3157 $self->{timer}->interval (1/30);
3158 } else {
3159 $label->{fg}[3] = $item->{fg}[3] || 1;
3160 }
3161
3162 push @widgets, $label;
3124 } 3163 }
3125 3164
3126 $self->clear; 3165 $self->clear;
3127 $self->SUPER::add (reverse @widgets); 3166 $self->SUPER::add (reverse @widgets);
3128} 3167}
… …
3133 $text =~ s/^\s+//; 3172 $text =~ s/^\s+//;
3134 $text =~ s/\s+$//; 3173 $text =~ s/\s+$//;
3135 3174
3136 return unless $text; 3175 return unless $text;
3137 3176
3138 my $timeout = time + ((delete $arg{timeout}) || 60); 3177 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3139 3178
3140 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3179 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3141 3180
3142 if (my $item = $self->{item}{$group}) { 3181 if (my $item = $self->{item}{$group}) {
3143 if ($item->{text} eq $text) { 3182 if ($item->{text} eq $text) {
… …
3173 3212
3174 $self->reorder; 3213 $self->reorder;
3175 $self->SUPER::reconfigure; 3214 $self->SUPER::reconfigure;
3176} 3215}
3177 3216
3217sub DESTROY {
3218 my ($self) = @_;
3219
3220 $self->{timer}->cancel;
3221
3222 $self->SUPER::DESTROY;
3223}
3224
3178############################################################################# 3225#############################################################################
3179 3226
3180package CFClient::UI::Inventory; 3227package CFClient::UI::Inventory;
3181 3228
3182our @ISA = CFClient::UI::ScrolledWindow::; 3229our @ISA = CFClient::UI::ScrolledWindow::;
… …
3474 3521
3475package CFClient::UI::Root; 3522package CFClient::UI::Root;
3476 3523
3477our @ISA = CFClient::UI::Container::; 3524our @ISA = CFClient::UI::Container::;
3478 3525
3526use List::Util qw(min max);
3527
3479use CFClient::OpenGL; 3528use CFClient::OpenGL;
3480 3529
3481sub new { 3530sub new {
3482 my $class = shift; 3531 my $class = shift;
3483 3532
… …
3617 3666
3618 delete $queue{$widget+0}; 3667 delete $queue{$widget+0};
3619 3668
3620 my ($w, $h) = $widget->size_request; 3669 my ($w, $h) = $widget->size_request;
3621 3670
3622 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3671 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3623 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3672 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3673
3674 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3675 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3624 3676
3625 $w = $widget->{force_w} if exists $widget->{force_w}; 3677 $w = $widget->{force_w} if exists $widget->{force_w};
3626 $h = $widget->{force_h} if exists $widget->{force_h}; 3678 $h = $widget->{force_h} if exists $widget->{force_h};
3627 3679
3628 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3680 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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