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.273 by root, Sat Jun 3 02:32:35 2006 UTC vs.
Revision 1.283 by root, Mon Jun 5 02:28:30 2006 UTC

… …
381} 381}
382 382
383sub set_max_size { 383sub set_max_size {
384 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
385 385
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
388} 390}
389 391
390sub set_tooltip { 392sub set_tooltip {
391 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
392 394
… …
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 552
551 glPushMatrix; 553 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
553 $self->_draw;
554 glPopMatrix;
555 555
556 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
557 my ($x, $y) = @$self{qw(x y)};
558
559 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
560 glEnable GL_BLEND; 558 glEnable GL_BLEND;
561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562 glBegin GL_QUADS; 560 glBegin GL_QUADS;
563 glVertex $x , $y; 561 glVertex 0 , 0;
564 glVertex $x + $self->{w}, $y; 562 glVertex $self->{w}, 0;
565 glVertex $x + $self->{w}, $y + $self->{h}; 563 glVertex $self->{w}, $self->{h};
566 glVertex $x , $y + $self->{h}; 564 glVertex 0 , $self->{h};
567 glEnd; 565 glEnd;
568 glDisable GL_BLEND; 566 glDisable GL_BLEND;
569 } 567 }
570 568
571 if ($ENV{CFPLUS_DEBUG} & 1) { 569 if ($ENV{CFPLUS_DEBUG} & 1) {
572 glPushMatrix; 570 glPushMatrix;
573 glColor 1, 1, 0, 1; 571 glColor 1, 1, 0, 1;
574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 572 glTranslate 0.375, 0.375;
575 glBegin GL_LINE_LOOP; 573 glBegin GL_LINE_LOOP;
576 glVertex 0 , 0; 574 glVertex 0 , 0;
577 glVertex $self->{w} - 1, 0; 575 glVertex $self->{w} - 1, 0;
578 glVertex $self->{w} - 1, $self->{h} - 1; 576 glVertex $self->{w} - 1, $self->{h} - 1;
579 glVertex 0 , $self->{h} - 1; 577 glVertex 0 , $self->{h} - 1;
580 glEnd; 578 glEnd;
581 glPopMatrix; 579 glPopMatrix;
582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 580 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
583 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
584} 585}
585 586
586sub _draw { 587sub _draw {
587 my ($self) = @_; 588 my ($self) = @_;
588 589
… …
626 627
627 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
628 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
629 630
630 glEnable GL_BLEND; 631 glEnable GL_BLEND;
631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632 glColor @$color; 633 glColor_premultiply @$color;
633 634
634 glBegin GL_QUADS; 635 glBegin GL_QUADS;
635 glVertex 0 , 0; 636 glVertex 0 , 0;
636 glVertex 0 , $h; 637 glVertex 0 , $h;
637 glVertex $w, $h; 638 glVertex $w, $h;
… …
794 $self->{children}[0]->configure (0, 0, $w, $h); 795 $self->{children}[0]->configure (0, 0, $w, $h);
795} 796}
796 797
797############################################################################# 798#############################################################################
798 799
800# back-buffered drawing area
801
799package CFClient::UI::Window; 802package CFClient::UI::Window;
800 803
801our @ISA = CFClient::UI::Bin::; 804our @ISA = CFClient::UI::Bin::;
802 805
803use CFClient::OpenGL; 806use CFClient::OpenGL;
… …
854 my $tex = $self->{texture} 857 my $tex = $self->{texture}
855 or return; 858 or return;
856 859
857 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
860 863
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
862 865
863 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
864} 867}
… …
1033 1036
1034 if ($self->{bg}) { 1037 if ($self->{bg}) {
1035 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
1036 1039
1037 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
1038 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1039 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
1040 1043
1041 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
1042 glVertex 0 , 0; 1045 glVertex 0 , 0;
1043 glVertex 0 , $h; 1046 glVertex 0 , $h;
1044 glVertex $w, $h; 1047 glVertex $w, $h;
… …
1158 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1159 1162
1160 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1161 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1162 1165
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1163 $self->realloc; 1167 $self->realloc;
1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 }; 1168 };
1166 1169
1167 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1168 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1169 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1172 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1173 1176
1174 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1175 1178
1176 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1177 }; 1182 };
1178 } else { 1183 } else {
1179 return 0; 1184 return 0;
1180 } 1185 }
1181 1186
… …
1533 1538
1534 delete $self->{texture}; 1539 delete $self->{texture};
1535 $self->SUPER::update; 1540 $self->SUPER::update;
1536} 1541}
1537 1542
1543sub realloc {
1544 my ($self) = @_;
1545
1546 delete $self->{ox};
1547 $self->SUPER::realloc;
1548}
1549
1538sub set_text { 1550sub set_text {
1539 my ($self, $text) = @_; 1551 my ($self, $text) = @_;
1540 1552
1541 return if $self->{text} eq "T$text"; 1553 return if $self->{text} eq "T$text";
1542 $self->{text} = "T$text"; 1554 $self->{text} = "T$text";
1543 1555
1544 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1545 $self->{layout}->set_text ($text); 1557 $self->{layout}->set_text ($text);
1558 delete $self->{req_h};
1546 1559
1547 $self->realloc; 1560 $self->realloc;
1548 $self->update; 1561 $self->update;
1549} 1562}
1550 1563
… …
1556 1569
1557 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1570 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1558 1571
1559 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1572 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1560 $self->{layout}->set_markup ($markup); 1573 $self->{layout}->set_markup ($markup);
1574 delete $self->{req_h};
1561 1575
1562 $self->realloc; 1576 $self->realloc;
1563 $self->update; 1577 $self->update;
1564} 1578}
1565 1579
1566sub size_request { 1580sub size_request {
1567 my ($self) = @_; 1581 my ($self) = @_;
1568 1582
1583 if (exists $self->{req_h}) {
1584 @$self{qw(req_w req_h)}
1585 } else {
1569 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1586 $self->{layout}->set_font ($self->{font}) if $self->{font};
1570 $self->{layout}->set_width ($self->{max_w} || -1); 1587 $self->{layout}->set_width ($self->{max_w} || -1);
1571 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1588 $self->{layout}->set_ellipsise ($self->{ellipsise});
1572 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1574 1591
1575 my ($w, $h) = $self->{layout}->size; 1592 my ($w, $h) = $self->{layout}->size;
1576 1593
1577 if (exists $self->{template}) { 1594 if (exists $self->{template}) {
1578 $self->{template}->set_font ($self->{font}) if $self->{font}; 1595 $self->{template}->set_font ($self->{font}) if $self->{font};
1579 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1596 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1580 1597
1581 my ($w2, $h2) = $self->{template}->size; 1598 my ($w2, $h2) = $self->{template}->size;
1582 1599
1583 $w = List::Util::max $w, $w2; 1600 $w = List::Util::max $w, $w2;
1584 $h = List::Util::max $h, $h2; 1601 $h = List::Util::max $h, $h2;
1585 } 1602 }
1586 1603
1587 ($w, $h) 1604 ($w, $h)
1605 }
1588} 1606}
1589 1607
1590sub size_allocate { 1608sub size_allocate {
1591 my ($self, $w, $h) = @_; 1609 my ($self, $w, $h) = @_;
1592 1610
… …
1632 }; 1650 };
1633 1651
1634 glEnable GL_TEXTURE_2D; 1652 glEnable GL_TEXTURE_2D;
1635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1636 1654
1655 glColor_premultiply @{$self->{fg}}
1637 if ($tex->{format} == GL_ALPHA) { 1656 if $tex->{format} == GL_ALPHA;
1638 glColor @{$self->{fg}}; 1657
1639 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1640 } else {
1641 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1658 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1642 }
1643 1659
1644 glDisable GL_TEXTURE_2D; 1660 glDisable GL_TEXTURE_2D;
1645} 1661}
1646 1662
1647############################################################################# 1663#############################################################################
… …
1674 1690
1675 delete $self->{cur_h}; 1691 delete $self->{cur_h};
1676 1692
1677 return if $self->{text} eq $text; 1693 return if $self->{text} eq $text;
1678 1694
1679 delete $self->{texture};
1680
1681 $self->{last_activity} = $::NOW; 1695 $self->{last_activity} = $::NOW;
1682 $self->{text} = $text; 1696 $self->{text} = $text;
1683 1697
1684 $text =~ s/./*/g if $self->{hidden}; 1698 $text =~ s/./*/g if $self->{hidden};
1685 $self->{layout}->set_text ("$text "); 1699 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h};
1686 1701
1687 $self->_emit (changed => $self->{text}); 1702 $self->_emit (changed => $self->{text});
1703
1704 $self->realloc;
1705 $self->update;
1688} 1706}
1689 1707
1690sub set_text { 1708sub set_text {
1691 my ($self, $text) = @_; 1709 my ($self, $text) = @_;
1692 1710
1693 $self->{cursor} = length $text; 1711 $self->{cursor} = length $text;
1694 $self->_set_text ($text); 1712 $self->_set_text ($text);
1695
1696 $self->realloc;
1697} 1713}
1698 1714
1699sub get_text { 1715sub get_text {
1700 $_[0]{text} 1716 $_[0]{text}
1701} 1717}
… …
1781 my ($self) = @_; 1797 my ($self) = @_;
1782 1798
1783 local $self->{fg} = $self->{fg}; 1799 local $self->{fg} = $self->{fg};
1784 1800
1785 if ($FOCUS == $self) { 1801 if ($FOCUS == $self) {
1786 glColor @{$self->{active_bg}}; 1802 glColor_premultiply @{$self->{active_bg}};
1787 $self->{fg} = $self->{active_fg}; 1803 $self->{fg} = $self->{active_fg};
1788 } else { 1804 } else {
1789 glColor @{$self->{bg}}; 1805 glColor_premultiply @{$self->{bg}};
1790 } 1806 }
1791 1807
1792 glEnable GL_BLEND; 1808 glEnable GL_BLEND;
1793 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1809 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1794 glBegin GL_QUADS; 1810 glBegin GL_QUADS;
1795 glVertex 0 , 0; 1811 glVertex 0 , 0;
1796 glVertex 0 , $self->{h}; 1812 glVertex 0 , $self->{h};
1797 glVertex $self->{w}, $self->{h}; 1813 glVertex $self->{w}, $self->{h};
1798 glVertex $self->{w}, 0; 1814 glVertex $self->{w}, 0;
… …
1908} 1924}
1909 1925
1910sub _draw { 1926sub _draw {
1911 my ($self) = @_; 1927 my ($self) = @_;
1912 1928
1913 local $self->{fg} = $self->{fg}; 1929 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1914
1915 if ($GRAB == $self) {
1916 $self->{fg} = $self->{active_fg};
1917 }
1918 1930
1919 glEnable GL_TEXTURE_2D; 1931 glEnable GL_TEXTURE_2D;
1920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1932 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1921 glColor 0, 0, 0, 1; 1933 glColor 0, 0, 0, 1;
1922 1934
… …
2147 2159
2148 my $h1 = $self->{h} * (1 - $ycut1); 2160 my $h1 = $self->{h} * (1 - $ycut1);
2149 my $h2 = $self->{h} * (1 - $ycut2); 2161 my $h2 = $self->{h} * (1 - $ycut2);
2150 2162
2151 glEnable GL_BLEND; 2163 glEnable GL_BLEND;
2152 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2164 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2165 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2153 glEnable GL_TEXTURE_2D; 2166 glEnable GL_TEXTURE_2D;
2154 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2167 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2155 2168
2156 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2169 glBindTexture GL_TEXTURE_2D, $t1->{name};
2157 glBegin GL_QUADS; 2170 glBegin GL_QUADS;
… …
2342} 2355}
2343 2356
2344sub update { 2357sub update {
2345 my ($self) = @_; 2358 my ($self) = @_;
2346 2359
2347 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2360 delete $self->{knob_w};
2361 $self->SUPER::update;
2362}
2363
2364sub _draw {
2365 my ($self) = @_;
2366
2367 unless ($self->{knob_w}) {
2348 $self->set_value ($self->{range}[0]); 2368 $self->set_value ($self->{range}[0]);
2349 2369
2350 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2370 my ($value, $lo, $hi, $page) = @{$self->{range}};
2351 my $range = ($hi - $page - $lo) || 1e-100; 2371 my $range = ($hi - $page - $lo) || 1e-100;
2352 2372
… …
2358 $value = ($value - $lo) / $range; 2378 $value = ($value - $lo) / $range;
2359 $value = $value * $self->{scale} + $self->{offset}; 2379 $value = $value * $self->{scale} + $self->{offset};
2360 2380
2361 $self->{knob_x} = $value - $knob_w * 0.5; 2381 $self->{knob_x} = $value - $knob_w * 0.5;
2362 $self->{knob_w} = $knob_w; 2382 $self->{knob_w} = $knob_w;
2363 }); 2383 }
2364
2365 $self->SUPER::update;
2366}
2367
2368sub _draw {
2369 my ($self) = @_;
2370 2384
2371 $self->SUPER::_draw (); 2385 $self->SUPER::_draw ();
2372 2386
2373 glScale $self->{w}, $self->{h}; 2387 glScale $self->{w}, $self->{h};
2374 2388
… …
2568 2582
2569 delete $self->{texture}; 2583 delete $self->{texture};
2570 } 2584 }
2571 2585
2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2586 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2573 glClearColor 0.5, 0.5, 0.5, 0; 2587 glClearColor 0, 0, 0, 0;
2574 glClear GL_COLOR_BUFFER_BIT; 2588 glClear GL_COLOR_BUFFER_BIT;
2575 2589
2576 my $top = int $self->{children}[1]{range}[0]; 2590 my $top = int $self->{children}[1]{range}[0];
2577 2591
2578 my $y0 = $top; 2592 my $y0 = $top;
… …
2613sub _draw { 2627sub _draw {
2614 my ($self) = @_; 2628 my ($self) = @_;
2615 2629
2616 glEnable GL_TEXTURE_2D; 2630 glEnable GL_TEXTURE_2D;
2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2631 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2618 glColor 1, 1, 1, 1; 2632 glColor 0, 0, 0, 1;
2619 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2633 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2620 glDisable GL_TEXTURE_2D; 2634 glDisable GL_TEXTURE_2D;
2621 2635
2622 $self->{children}[1]->draw; 2636 $self->{children}[1]->draw;
2623 2637
2624} 2638}
… …
2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2865 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2852 2866
2853 if ($tex) { 2867 if ($tex) {
2854 glEnable GL_TEXTURE_2D; 2868 glEnable GL_TEXTURE_2D;
2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2856 glColor 1, 1, 1, 1; 2870 glColor 0, 0, 0, 1;
2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2858 glDisable GL_TEXTURE_2D; 2872 glDisable GL_TEXTURE_2D;
2859 } 2873 }
2860} 2874}
2861 2875
… …
3069our @ISA = CFClient::UI::VBox::; 3083our @ISA = CFClient::UI::VBox::;
3070 3084
3071sub new { 3085sub new {
3072 my $class = shift; 3086 my $class = shift;
3073 3087
3074 $class->SUPER::new ( 3088 my $self = $class->SUPER::new (
3075 fontsize => 0.8, 3089 fontsize => 0.8,
3076 @_, 3090 @_,
3077 ) 3091 );
3092
3093 Scalar::Util::weaken (my $this = $self);
3094
3095 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3096
3097 $self
3078} 3098}
3079 3099
3080sub reorder { 3100sub reorder {
3081 my ($self) = @_; 3101 my ($self) = @_;
3082 my $NOW = time; 3102 my $NOW = Time::HiRes::time;
3103
3104 # freeze display when hovering over any label
3105 return if $CFClient::UI::TOOLTIP->{owner}
3106 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3107 values %{ $self->{item} };
3083 3108
3084 while (my ($k, $v) = each %{ $self->{item} }) { 3109 while (my ($k, $v) = each %{ $self->{item} }) {
3085 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3110 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3086 } 3111 }
3087 3112
… …
3090 my @items = sort { 3115 my @items = sort {
3091 $a->{pri} <=> $b->{pri} 3116 $a->{pri} <=> $b->{pri}
3092 or $b->{id} <=> $a->{id} 3117 or $b->{id} <=> $a->{id}
3093 } values %{ $self->{item} }; 3118 } values %{ $self->{item} };
3094 3119
3120 $self->{timer}->interval (1);
3121
3095 my $count = 10 + 1; 3122 my $count = 10 + 1;
3096 for my $item (@items) { 3123 for my $item (@items) {
3097 last unless --$count; 3124 last unless --$count;
3098 3125
3099 push @widgets, $item->{label} ||= do { 3126 my $label = $item->{label} ||= do {
3100 # TODO: doesn't handle markup well (read as: at all) 3127 # TODO: doesn't handle markup well (read as: at all)
3101 my $short = $item->{count} > 1 3128 my $short = $item->{count} > 1
3102 ? "<b>$item->{count} ×</b> $item->{text}" 3129 ? "<b>$item->{count} ×</b> $item->{text}"
3103 : $item->{text}; 3130 : $item->{text};
3104 3131
… …
3112 tooltip => $item->{tooltip}, 3139 tooltip => $item->{tooltip},
3113 tooltip_font => $::FONT_PROP, 3140 tooltip_font => $::FONT_PROP,
3114 tooltip_width => 0.67, 3141 tooltip_width => 0.67,
3115 fontsize => $item->{fontsize} || $self->{fontsize}, 3142 fontsize => $item->{fontsize} || $self->{fontsize},
3116 max_w => $::WIDTH * 0.44, 3143 max_w => $::WIDTH * 0.44,
3117 fg => $item->{fg}, 3144 fg => [@{ $item->{fg} }],
3118 can_events => 1, 3145 can_events => 1,
3119 can_hover => 1 3146 can_hover => 1
3120 }; 3147 };
3148
3149 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3150 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3151 $label->update;
3152 $label->set_max_size (undef, $label->{req_h} * $diff)
3153 if $diff < 1;
3154 $self->{timer}->interval (1/30);
3155 } else {
3156 $label->{fg}[3] = $item->{fg}[3] || 1;
3157 }
3158
3159 push @widgets, $label;
3121 } 3160 }
3122 3161
3123 $self->clear; 3162 $self->clear;
3124 $self->SUPER::add (reverse @widgets); 3163 $self->SUPER::add (reverse @widgets);
3125} 3164}
… …
3130 $text =~ s/^\s+//; 3169 $text =~ s/^\s+//;
3131 $text =~ s/\s+$//; 3170 $text =~ s/\s+$//;
3132 3171
3133 return unless $text; 3172 return unless $text;
3134 3173
3135 my $timeout = time + ((delete $arg{timeout}) || 60); 3174 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3136 3175
3137 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3176 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3138 3177
3139 if (my $item = $self->{item}{$group}) { 3178 if (my $item = $self->{item}{$group}) {
3140 if ($item->{text} eq $text) { 3179 if ($item->{text} eq $text) {
… …
3170 3209
3171 $self->reorder; 3210 $self->reorder;
3172 $self->SUPER::reconfigure; 3211 $self->SUPER::reconfigure;
3173} 3212}
3174 3213
3214sub DESTROY {
3215 my ($self) = @_;
3216
3217 $self->{timer}->cancel;
3218
3219 $self->SUPER::DESTROY;
3220}
3221
3175############################################################################# 3222#############################################################################
3176 3223
3177package CFClient::UI::Inventory; 3224package CFClient::UI::Inventory;
3178 3225
3179our @ISA = CFClient::UI::ScrolledWindow::; 3226our @ISA = CFClient::UI::ScrolledWindow::;
… …
3471 3518
3472package CFClient::UI::Root; 3519package CFClient::UI::Root;
3473 3520
3474our @ISA = CFClient::UI::Container::; 3521our @ISA = CFClient::UI::Container::;
3475 3522
3523use List::Util qw(min max);
3524
3476use CFClient::OpenGL; 3525use CFClient::OpenGL;
3477 3526
3478sub new { 3527sub new {
3479 my $class = shift; 3528 my $class = shift;
3480 3529
… …
3614 3663
3615 delete $queue{$widget+0}; 3664 delete $queue{$widget+0};
3616 3665
3617 my ($w, $h) = $widget->size_request; 3666 my ($w, $h) = $widget->size_request;
3618 3667
3619 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3668 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3620 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3669 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3670
3671 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3672 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3621 3673
3622 $w = $widget->{force_w} if exists $widget->{force_w}; 3674 $w = $widget->{force_w} if exists $widget->{force_w};
3623 $h = $widget->{force_h} if exists $widget->{force_h}; 3675 $h = $widget->{force_h} if exists $widget->{force_h};
3624 3676
3625 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3677 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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