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.272 by root, Sat Jun 3 01:47:14 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}
… …
955package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
956 959
957our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
958 961
959sub new { 962sub new {
960 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
961 966
962 my $self; 967 my $self;
963 968
964 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
965 vertical => 1, 970 vertical => 1,
… …
970 ; 975 ;
971 976
972 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
973 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
974 slider => $slider, 979 slider => $slider,
975 @_, 980 %arg,
976 ); 981 );
977 982
978 $self->{vp}->add ($self->{scrolled});
979 $self->add ($self->{vp});
980 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
981 985
982 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
983} 993}
984 994
985sub update { 995sub update {
986 my ($self) = @_; 996 my ($self) = @_;
987 997
… …
1026 1036
1027 if ($self->{bg}) { 1037 if ($self->{bg}) {
1028 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
1029 1039
1030 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
1031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1032 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
1033 1043
1034 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
1035 glVertex 0 , 0; 1045 glVertex 0 , 0;
1036 glVertex 0 , $h; 1046 glVertex 0 , $h;
1037 glVertex $w, $h; 1047 glVertex $w, $h;
… …
1151 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1152 1162
1153 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1154 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1155 1165
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1156 $self->realloc; 1167 $self->realloc;
1157 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1158 }; 1168 };
1159 1169
1160 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1161 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1162 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1165 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1166 1176
1167 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1168 1178
1169 $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});
1170 }; 1182 };
1171 } else { 1183 } else {
1172 return 0; 1184 return 0;
1173 } 1185 }
1174 1186
… …
1526 1538
1527 delete $self->{texture}; 1539 delete $self->{texture};
1528 $self->SUPER::update; 1540 $self->SUPER::update;
1529} 1541}
1530 1542
1543sub realloc {
1544 my ($self) = @_;
1545
1546 delete $self->{ox};
1547 $self->SUPER::realloc;
1548}
1549
1531sub set_text { 1550sub set_text {
1532 my ($self, $text) = @_; 1551 my ($self, $text) = @_;
1533 1552
1534 return if $self->{text} eq "T$text"; 1553 return if $self->{text} eq "T$text";
1535 $self->{text} = "T$text"; 1554 $self->{text} = "T$text";
1536 1555
1537 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1538 $self->{layout}->set_text ($text); 1557 $self->{layout}->set_text ($text);
1558 delete $self->{req_h};
1539 1559
1540 $self->realloc; 1560 $self->realloc;
1541 $self->update; 1561 $self->update;
1542} 1562}
1543 1563
… …
1549 1569
1550 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1570 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1551 1571
1552 $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;
1553 $self->{layout}->set_markup ($markup); 1573 $self->{layout}->set_markup ($markup);
1574 delete $self->{req_h};
1554 1575
1555 $self->realloc; 1576 $self->realloc;
1556 $self->update; 1577 $self->update;
1557} 1578}
1558 1579
1559sub size_request { 1580sub size_request {
1560 my ($self) = @_; 1581 my ($self) = @_;
1561 1582
1583 if (exists $self->{req_h}) {
1584 @$self{qw(req_w req_h)}
1585 } else {
1562 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1586 $self->{layout}->set_font ($self->{font}) if $self->{font};
1563 $self->{layout}->set_width ($self->{max_w} || -1); 1587 $self->{layout}->set_width ($self->{max_w} || -1);
1564 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1588 $self->{layout}->set_ellipsise ($self->{ellipsise});
1565 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1566 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1567 1591
1568 my ($w, $h) = $self->{layout}->size; 1592 my ($w, $h) = $self->{layout}->size;
1569 1593
1570 if (exists $self->{template}) { 1594 if (exists $self->{template}) {
1571 $self->{template}->set_font ($self->{font}) if $self->{font}; 1595 $self->{template}->set_font ($self->{font}) if $self->{font};
1572 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1596 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1573 1597
1574 my ($w2, $h2) = $self->{template}->size; 1598 my ($w2, $h2) = $self->{template}->size;
1575 1599
1576 $w = List::Util::max $w, $w2; 1600 $w = List::Util::max $w, $w2;
1577 $h = List::Util::max $h, $h2; 1601 $h = List::Util::max $h, $h2;
1578 } 1602 }
1579 1603
1580 ($w, $h) 1604 ($w, $h)
1605 }
1581} 1606}
1582 1607
1583sub size_allocate { 1608sub size_allocate {
1584 my ($self, $w, $h) = @_; 1609 my ($self, $w, $h) = @_;
1585 1610
… …
1625 }; 1650 };
1626 1651
1627 glEnable GL_TEXTURE_2D; 1652 glEnable GL_TEXTURE_2D;
1628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1629 1654
1655 glColor_premultiply @{$self->{fg}}
1630 if ($tex->{format} == GL_ALPHA) { 1656 if $tex->{format} == GL_ALPHA;
1631 glColor @{$self->{fg}}; 1657
1632 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1633 } else {
1634 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1658 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1635 }
1636 1659
1637 glDisable GL_TEXTURE_2D; 1660 glDisable GL_TEXTURE_2D;
1638} 1661}
1639 1662
1640############################################################################# 1663#############################################################################
… …
1667 1690
1668 delete $self->{cur_h}; 1691 delete $self->{cur_h};
1669 1692
1670 return if $self->{text} eq $text; 1693 return if $self->{text} eq $text;
1671 1694
1672 delete $self->{texture};
1673
1674 $self->{last_activity} = $::NOW; 1695 $self->{last_activity} = $::NOW;
1675 $self->{text} = $text; 1696 $self->{text} = $text;
1676 1697
1677 $text =~ s/./*/g if $self->{hidden}; 1698 $text =~ s/./*/g if $self->{hidden};
1678 $self->{layout}->set_text ("$text "); 1699 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h};
1679 1701
1680 $self->_emit (changed => $self->{text}); 1702 $self->_emit (changed => $self->{text});
1703
1704 $self->realloc;
1705 $self->update;
1681} 1706}
1682 1707
1683sub set_text { 1708sub set_text {
1684 my ($self, $text) = @_; 1709 my ($self, $text) = @_;
1685 1710
1686 $self->{cursor} = length $text; 1711 $self->{cursor} = length $text;
1687 $self->_set_text ($text); 1712 $self->_set_text ($text);
1688
1689 $self->realloc;
1690} 1713}
1691 1714
1692sub get_text { 1715sub get_text {
1693 $_[0]{text} 1716 $_[0]{text}
1694} 1717}
… …
1774 my ($self) = @_; 1797 my ($self) = @_;
1775 1798
1776 local $self->{fg} = $self->{fg}; 1799 local $self->{fg} = $self->{fg};
1777 1800
1778 if ($FOCUS == $self) { 1801 if ($FOCUS == $self) {
1779 glColor @{$self->{active_bg}}; 1802 glColor_premultiply @{$self->{active_bg}};
1780 $self->{fg} = $self->{active_fg}; 1803 $self->{fg} = $self->{active_fg};
1781 } else { 1804 } else {
1782 glColor @{$self->{bg}}; 1805 glColor_premultiply @{$self->{bg}};
1783 } 1806 }
1784 1807
1785 glEnable GL_BLEND; 1808 glEnable GL_BLEND;
1786 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1809 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1787 glBegin GL_QUADS; 1810 glBegin GL_QUADS;
1788 glVertex 0 , 0; 1811 glVertex 0 , 0;
1789 glVertex 0 , $self->{h}; 1812 glVertex 0 , $self->{h};
1790 glVertex $self->{w}, $self->{h}; 1813 glVertex $self->{w}, $self->{h};
1791 glVertex $self->{w}, 0; 1814 glVertex $self->{w}, 0;
… …
1901} 1924}
1902 1925
1903sub _draw { 1926sub _draw {
1904 my ($self) = @_; 1927 my ($self) = @_;
1905 1928
1906 local $self->{fg} = $self->{fg}; 1929 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1907
1908 if ($GRAB == $self) {
1909 $self->{fg} = $self->{active_fg};
1910 }
1911 1930
1912 glEnable GL_TEXTURE_2D; 1931 glEnable GL_TEXTURE_2D;
1913 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1932 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1914 glColor 0, 0, 0, 1; 1933 glColor 0, 0, 0, 1;
1915 1934
… …
2140 2159
2141 my $h1 = $self->{h} * (1 - $ycut1); 2160 my $h1 = $self->{h} * (1 - $ycut1);
2142 my $h2 = $self->{h} * (1 - $ycut2); 2161 my $h2 = $self->{h} * (1 - $ycut2);
2143 2162
2144 glEnable GL_BLEND; 2163 glEnable GL_BLEND;
2145 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;
2146 glEnable GL_TEXTURE_2D; 2166 glEnable GL_TEXTURE_2D;
2147 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2167 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2148 2168
2149 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2169 glBindTexture GL_TEXTURE_2D, $t1->{name};
2150 glBegin GL_QUADS; 2170 glBegin GL_QUADS;
… …
2335} 2355}
2336 2356
2337sub update { 2357sub update {
2338 my ($self) = @_; 2358 my ($self) = @_;
2339 2359
2340 $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}) {
2341 $self->set_value ($self->{range}[0]); 2368 $self->set_value ($self->{range}[0]);
2342 2369
2343 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2370 my ($value, $lo, $hi, $page) = @{$self->{range}};
2344 my $range = ($hi - $page - $lo) || 1e-100; 2371 my $range = ($hi - $page - $lo) || 1e-100;
2345 2372
… …
2351 $value = ($value - $lo) / $range; 2378 $value = ($value - $lo) / $range;
2352 $value = $value * $self->{scale} + $self->{offset}; 2379 $value = $value * $self->{scale} + $self->{offset};
2353 2380
2354 $self->{knob_x} = $value - $knob_w * 0.5; 2381 $self->{knob_x} = $value - $knob_w * 0.5;
2355 $self->{knob_w} = $knob_w; 2382 $self->{knob_w} = $knob_w;
2356 }); 2383 }
2357
2358 $self->SUPER::update;
2359}
2360
2361sub _draw {
2362 my ($self) = @_;
2363 2384
2364 $self->SUPER::_draw (); 2385 $self->SUPER::_draw ();
2365 2386
2366 glScale $self->{w}, $self->{h}; 2387 glScale $self->{w}, $self->{h};
2367 2388
… …
2561 2582
2562 delete $self->{texture}; 2583 delete $self->{texture};
2563 } 2584 }
2564 2585
2565 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2586 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2566 glClearColor 0.5, 0.5, 0.5, 0; 2587 glClearColor 0, 0, 0, 0;
2567 glClear GL_COLOR_BUFFER_BIT; 2588 glClear GL_COLOR_BUFFER_BIT;
2568 2589
2569 my $top = int $self->{children}[1]{range}[0]; 2590 my $top = int $self->{children}[1]{range}[0];
2570 2591
2571 my $y0 = $top; 2592 my $y0 = $top;
… …
2606sub _draw { 2627sub _draw {
2607 my ($self) = @_; 2628 my ($self) = @_;
2608 2629
2609 glEnable GL_TEXTURE_2D; 2630 glEnable GL_TEXTURE_2D;
2610 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2631 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2611 glColor 1, 1, 1, 1; 2632 glColor 0, 0, 0, 1;
2612 $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});
2613 glDisable GL_TEXTURE_2D; 2634 glDisable GL_TEXTURE_2D;
2614 2635
2615 $self->{children}[1]->draw; 2636 $self->{children}[1]->draw;
2616 2637
2617} 2638}
… …
2844 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2865 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2845 2866
2846 if ($tex) { 2867 if ($tex) {
2847 glEnable GL_TEXTURE_2D; 2868 glEnable GL_TEXTURE_2D;
2848 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2849 glColor 1, 1, 1, 1; 2870 glColor 0, 0, 0, 1;
2850 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2851 glDisable GL_TEXTURE_2D; 2872 glDisable GL_TEXTURE_2D;
2852 } 2873 }
2853} 2874}
2854 2875
… …
3022 my $class = shift; 3043 my $class = shift;
3023 3044
3024 my $self = $class->SUPER::new ( 3045 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar), 3046 buttonbar => (new CFClient::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3047 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3048 # filter => # will be put between multiplexer and $self
3027 @_, 3049 @_,
3028 ); 3050 );
3029 3051
3052 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer}); 3053 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3031 3054
3032 $self 3055 $self
3033} 3056}
3034 3057
3035sub add { 3058sub add {
… …
3060our @ISA = CFClient::UI::VBox::; 3083our @ISA = CFClient::UI::VBox::;
3061 3084
3062sub new { 3085sub new {
3063 my $class = shift; 3086 my $class = shift;
3064 3087
3065 $class->SUPER::new ( 3088 my $self = $class->SUPER::new (
3066 fontsize => 0.8, 3089 fontsize => 0.8,
3067 @_, 3090 @_,
3068 ) 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
3069} 3098}
3070 3099
3071sub reorder { 3100sub reorder {
3072 my ($self) = @_; 3101 my ($self) = @_;
3073 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} };
3074 3108
3075 while (my ($k, $v) = each %{ $self->{item} }) { 3109 while (my ($k, $v) = each %{ $self->{item} }) {
3076 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3110 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3077 } 3111 }
3078 3112
… …
3081 my @items = sort { 3115 my @items = sort {
3082 $a->{pri} <=> $b->{pri} 3116 $a->{pri} <=> $b->{pri}
3083 or $b->{id} <=> $a->{id} 3117 or $b->{id} <=> $a->{id}
3084 } values %{ $self->{item} }; 3118 } values %{ $self->{item} };
3085 3119
3120 $self->{timer}->interval (1);
3121
3086 my $count = 10 + 1; 3122 my $count = 10 + 1;
3087 for my $item (@items) { 3123 for my $item (@items) {
3088 last unless --$count; 3124 last unless --$count;
3089 3125
3090 push @widgets, $item->{label} ||= do { 3126 my $label = $item->{label} ||= do {
3091 # TODO: doesn't handle markup well (read as: at all) 3127 # TODO: doesn't handle markup well (read as: at all)
3092 my $short = $item->{count} > 1 3128 my $short = $item->{count} > 1
3093 ? "<b>$item->{count} ×</b> $item->{text}" 3129 ? "<b>$item->{count} ×</b> $item->{text}"
3094 : $item->{text}; 3130 : $item->{text};
3095 3131
… …
3103 tooltip => $item->{tooltip}, 3139 tooltip => $item->{tooltip},
3104 tooltip_font => $::FONT_PROP, 3140 tooltip_font => $::FONT_PROP,
3105 tooltip_width => 0.67, 3141 tooltip_width => 0.67,
3106 fontsize => $item->{fontsize} || $self->{fontsize}, 3142 fontsize => $item->{fontsize} || $self->{fontsize},
3107 max_w => $::WIDTH * 0.44, 3143 max_w => $::WIDTH * 0.44,
3108 fg => $item->{fg}, 3144 fg => [@{ $item->{fg} }],
3109 can_events => 1, 3145 can_events => 1,
3110 can_hover => 1 3146 can_hover => 1
3111 }; 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;
3112 } 3160 }
3113 3161
3114 $self->clear; 3162 $self->clear;
3115 $self->SUPER::add (reverse @widgets); 3163 $self->SUPER::add (reverse @widgets);
3116} 3164}
… …
3121 $text =~ s/^\s+//; 3169 $text =~ s/^\s+//;
3122 $text =~ s/\s+$//; 3170 $text =~ s/\s+$//;
3123 3171
3124 return unless $text; 3172 return unless $text;
3125 3173
3126 my $timeout = time + ((delete $arg{timeout}) || 60); 3174 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3127 3175
3128 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3176 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3129 3177
3130 if (my $item = $self->{item}{$group}) { 3178 if (my $item = $self->{item}{$group}) {
3131 if ($item->{text} eq $text) { 3179 if ($item->{text} eq $text) {
… …
3161 3209
3162 $self->reorder; 3210 $self->reorder;
3163 $self->SUPER::reconfigure; 3211 $self->SUPER::reconfigure;
3164} 3212}
3165 3213
3214sub DESTROY {
3215 my ($self) = @_;
3216
3217 $self->{timer}->cancel;
3218
3219 $self->SUPER::DESTROY;
3220}
3221
3166############################################################################# 3222#############################################################################
3167 3223
3168package CFClient::UI::Inventory; 3224package CFClient::UI::Inventory;
3169 3225
3170our @ISA = CFClient::UI::ScrolledWindow::; 3226our @ISA = CFClient::UI::ScrolledWindow::;
3171 3227
3172sub new { 3228sub new {
3173 my $class = shift; 3229 my $class = shift;
3174 3230
3175 my $self = $class->SUPER::new ( 3231 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3232 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3177 @_, 3233 @_,
3178 ); 3234 );
3179 3235
3180 $self 3236 $self
3181} 3237}
3182 3238
3183sub set_items { 3239sub set_items {
3184 my ($self, $items) = @_; 3240 my ($self, $items) = @_;
3185 3241
3186 $self->{scrolled}->clear; 3242 $self->{child}->clear;
3187 return unless $items; 3243 return unless $items;
3188 3244
3189 my @items = sort { 3245 my @items = sort {
3190 ($a->{type} <=> $b->{type}) 3246 ($a->{type} <=> $b->{type})
3191 or ($a->{name} cmp $b->{name}) 3247 or ($a->{name} cmp $b->{name})
… …
3195 3251
3196 my $row = 0; 3252 my $row = 0;
3197 for my $item (@items) { 3253 for my $item (@items) {
3198 CFClient::Item::update_widgets $item; 3254 CFClient::Item::update_widgets $item;
3199 3255
3200 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3256 $self->{child}->add (0, $row, $item->{face_widget});
3201 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3257 $self->{child}->add (1, $row, $item->{desc_widget});
3202 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3258 $self->{child}->add (2, $row, $item->{weight_widget});
3203 3259
3204 $row++; 3260 $row++;
3205 } 3261 }
3206} 3262}
3207 3263
… …
3404 3460
3405############################################################################# 3461#############################################################################
3406 3462
3407package CFClient::UI::SpellList; 3463package CFClient::UI::SpellList;
3408 3464
3409our @ISA = CFClient::UI::ScrolledWindow::; 3465our @ISA = CFClient::UI::Table::;
3410 3466
3411sub new { 3467sub new {
3412 my $class = shift; 3468 my $class = shift;
3413 3469
3414 my $self = $class->SUPER::new ( 3470 my $self = $class->SUPER::new (
3415 binding => [], 3471 binding => [],
3416 commands => [], 3472 commands => [],
3417 scrolled => (new CFClient::UI::Table),
3418 @_, 3473 @_,
3419 ) 3474 )
3420} 3475}
3421 3476
3422# XXX: Do sorting? Argl... 3477# XXX: Do sorting? Argl...
3423sub add_spell { 3478sub add_spell {
3424 my ($self, $spell) = @_; 3479 my ($self, $spell) = @_;
3425 $self->{spells}->{$spell->{name}} = $spell; 3480 $self->{spells}->{$spell->{name}} = $spell;
3426 3481
3427 $self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face 3482 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3428 face => $spell->{face}, 3483 face => $spell->{face},
3429 can_hover => 1, 3484 can_hover => 1,
3430 can_events => 1, 3485 can_events => 1,
3431 tooltip => $spell->{message}); 3486 tooltip => $spell->{message});
3432 3487
3433 $self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label 3488 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3434 text => $spell->{name}, 3489 text => $spell->{name},
3435 can_hover => 1, 3490 can_hover => 1,
3436 can_events => 1, 3491 can_events => 1,
3437 tooltip => $spell->{message}, 3492 tooltip => $spell->{message},
3438 expand => 1); 3493 expand => 1);
3439 3494
3440 $self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label 3495 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3441 text => (sprintf "lvl: %2d sp: %2d dmg: %2d", 3496 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3442 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}), 3497 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3443 expand => 1); 3498 expand => 1);
3444 3499
3445 $self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button 3500 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3446 text => "bind to key", 3501 text => "bind to key",
3447 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }); 3502 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3448} 3503}
3449 3504
3450sub rebuild_spell_list { 3505sub rebuild_spell_list {
… …
3462############################################################################# 3517#############################################################################
3463 3518
3464package CFClient::UI::Root; 3519package CFClient::UI::Root;
3465 3520
3466our @ISA = CFClient::UI::Container::; 3521our @ISA = CFClient::UI::Container::;
3522
3523use List::Util qw(min max);
3467 3524
3468use CFClient::OpenGL; 3525use CFClient::OpenGL;
3469 3526
3470sub new { 3527sub new {
3471 my $class = shift; 3528 my $class = shift;
… …
3606 3663
3607 delete $queue{$widget+0}; 3664 delete $queue{$widget+0};
3608 3665
3609 my ($w, $h) = $widget->size_request; 3666 my ($w, $h) = $widget->size_request;
3610 3667
3611 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3668 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3612 $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};
3613 3673
3614 $w = $widget->{force_w} if exists $widget->{force_w}; 3674 $w = $widget->{force_w} if exists $widget->{force_w};
3615 $h = $widget->{force_h} if exists $widget->{force_h}; 3675 $h = $widget->{force_h} if exists $widget->{force_h};
3616 3676
3617 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