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.271 by root, Fri Jun 2 22:13:47 2006 UTC vs.
Revision 1.283 by root, Mon Jun 5 02:28:30 2006 UTC

… …
371sub size_allocate { 371sub size_allocate {
372 # nothing to be done 372 # nothing to be done
373} 373}
374 374
375sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
376} 381}
377 382
378sub set_max_size { 383sub set_max_size {
379 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
380 385
381 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
382 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
383} 390}
384 391
385sub set_tooltip { 392sub set_tooltip {
386 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
387 394
… …
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
545 552
546 glPushMatrix; 553 glPushMatrix;
547 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
548 $self->_draw;
549 glPopMatrix;
550 555
551 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
552 my ($x, $y) = @$self{qw(x y)};
553
554 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
555 glEnable GL_BLEND; 558 glEnable GL_BLEND;
556 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
557 glBegin GL_QUADS; 560 glBegin GL_QUADS;
558 glVertex $x , $y; 561 glVertex 0 , 0;
559 glVertex $x + $self->{w}, $y; 562 glVertex $self->{w}, 0;
560 glVertex $x + $self->{w}, $y + $self->{h}; 563 glVertex $self->{w}, $self->{h};
561 glVertex $x , $y + $self->{h}; 564 glVertex 0 , $self->{h};
562 glEnd; 565 glEnd;
563 glDisable GL_BLEND; 566 glDisable GL_BLEND;
564 } 567 }
565 568
566 if ($ENV{CFPLUS_DEBUG} & 1) { 569 if ($ENV{CFPLUS_DEBUG} & 1) {
567 glPushMatrix; 570 glPushMatrix;
568 glColor 1, 1, 0, 1; 571 glColor 1, 1, 0, 1;
569 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 572 glTranslate 0.375, 0.375;
570 glBegin GL_LINE_LOOP; 573 glBegin GL_LINE_LOOP;
571 glVertex 0 , 0; 574 glVertex 0 , 0;
572 glVertex $self->{w} - 1, 0; 575 glVertex $self->{w} - 1, 0;
573 glVertex $self->{w} - 1, $self->{h} - 1; 576 glVertex $self->{w} - 1, $self->{h} - 1;
574 glVertex 0 , $self->{h} - 1; 577 glVertex 0 , $self->{h} - 1;
575 glEnd; 578 glEnd;
576 glPopMatrix; 579 glPopMatrix;
577 #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;
578 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
579} 585}
580 586
581sub _draw { 587sub _draw {
582 my ($self) = @_; 588 my ($self) = @_;
583 589
… …
621 627
622 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
623 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
624 630
625 glEnable GL_BLEND; 631 glEnable GL_BLEND;
626 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
627 glColor @$color; 633 glColor_premultiply @$color;
628 634
629 glBegin GL_QUADS; 635 glBegin GL_QUADS;
630 glVertex 0 , 0; 636 glVertex 0 , 0;
631 glVertex 0 , $h; 637 glVertex 0 , $h;
632 glVertex $w, $h; 638 glVertex $w, $h;
… …
663our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
664 670
665sub new { 671sub new {
666 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
667 673
668 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
669 675
670 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
671 children => [], 677 children => [],
672 can_events => 0, 678 can_events => 0,
673 %arg, 679 %arg,
674 ); 680 );
681
675 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
676 684
677 $self 685 $self
678} 686}
679 687
680sub add { 688sub add {
… …
728 $x -= $self->{x}; 736 $x -= $self->{x};
729 $y -= $self->{y}; 737 $y -= $self->{y};
730 738
731 my $res; 739 my $res;
732 740
733 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
734 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
735 and return $res; 743 and return $res;
736 } 744 }
737 745
738 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
787 $self->{children}[0]->configure (0, 0, $w, $h); 795 $self->{children}[0]->configure (0, 0, $w, $h);
788} 796}
789 797
790############################################################################# 798#############################################################################
791 799
800# back-buffered drawing area
801
792package CFClient::UI::Window; 802package CFClient::UI::Window;
793 803
794our @ISA = CFClient::UI::Bin::; 804our @ISA = CFClient::UI::Bin::;
795 805
796use CFClient::OpenGL; 806use CFClient::OpenGL;
… …
847 my $tex = $self->{texture} 857 my $tex = $self->{texture}
848 or return; 858 or return;
849 859
850 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
851 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
852 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
853 863
854 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
855 865
856 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
857} 867}
… …
948package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
949 959
950our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
951 961
952sub new { 962sub new {
953 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
954 966
955 my $self; 967 my $self;
956 968
957 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
958 vertical => 1, 970 vertical => 1,
… …
963 ; 975 ;
964 976
965 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
966 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
967 slider => $slider, 979 slider => $slider,
968 @_, 980 %arg,
969 ); 981 );
970 982
971 $self->{vp}->add ($self->{scrolled});
972 $self->add ($self->{vp});
973 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
974 985
975 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
976} 993}
977 994
978sub update { 995sub update {
979 my ($self) = @_; 996 my ($self) = @_;
980 997
… …
1019 1036
1020 if ($self->{bg}) { 1037 if ($self->{bg}) {
1021 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
1022 1039
1023 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
1024 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1025 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
1026 1043
1027 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
1028 glVertex 0 , 0; 1045 glVertex 0 , 0;
1029 glVertex 0 , $h; 1046 glVertex 0 , $h;
1030 glVertex $w, $h; 1047 glVertex $w, $h;
… …
1144 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1145 1162
1146 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1147 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1148 1165
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1149 $self->realloc; 1167 $self->realloc;
1150 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1151 }; 1168 };
1152 1169
1153 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1154 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1155 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1158 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1159 1176
1160 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1161 1178
1162 $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});
1163 }; 1182 };
1164 } else { 1183 } else {
1165 return 0; 1184 return 0;
1166 } 1185 }
1167 1186
… …
1519 1538
1520 delete $self->{texture}; 1539 delete $self->{texture};
1521 $self->SUPER::update; 1540 $self->SUPER::update;
1522} 1541}
1523 1542
1543sub realloc {
1544 my ($self) = @_;
1545
1546 delete $self->{ox};
1547 $self->SUPER::realloc;
1548}
1549
1524sub set_text { 1550sub set_text {
1525 my ($self, $text) = @_; 1551 my ($self, $text) = @_;
1526 1552
1527 return if $self->{text} eq "T$text"; 1553 return if $self->{text} eq "T$text";
1528 $self->{text} = "T$text"; 1554 $self->{text} = "T$text";
1529 1555
1530 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1531 $self->{layout}->set_text ($text); 1557 $self->{layout}->set_text ($text);
1558 delete $self->{req_h};
1532 1559
1533 $self->realloc; 1560 $self->realloc;
1534 $self->update; 1561 $self->update;
1535} 1562}
1536 1563
… …
1542 1569
1543 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1570 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1544 1571
1545 $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;
1546 $self->{layout}->set_markup ($markup); 1573 $self->{layout}->set_markup ($markup);
1574 delete $self->{req_h};
1547 1575
1548 $self->realloc; 1576 $self->realloc;
1549 $self->update; 1577 $self->update;
1550} 1578}
1551 1579
1552sub size_request { 1580sub size_request {
1553 my ($self) = @_; 1581 my ($self) = @_;
1554 1582
1583 if (exists $self->{req_h}) {
1584 @$self{qw(req_w req_h)}
1585 } else {
1555 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1586 $self->{layout}->set_font ($self->{font}) if $self->{font};
1556 $self->{layout}->set_width ($self->{max_w} || -1); 1587 $self->{layout}->set_width ($self->{max_w} || -1);
1557 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1588 $self->{layout}->set_ellipsise ($self->{ellipsise});
1558 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1559 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1560 1591
1561 my ($w, $h) = $self->{layout}->size; 1592 my ($w, $h) = $self->{layout}->size;
1562 1593
1563 if (exists $self->{template}) { 1594 if (exists $self->{template}) {
1564 $self->{template}->set_font ($self->{font}) if $self->{font}; 1595 $self->{template}->set_font ($self->{font}) if $self->{font};
1565 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1596 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1566 1597
1567 my ($w2, $h2) = $self->{template}->size; 1598 my ($w2, $h2) = $self->{template}->size;
1568 1599
1569 $w = List::Util::max $w, $w2; 1600 $w = List::Util::max $w, $w2;
1570 $h = List::Util::max $h, $h2; 1601 $h = List::Util::max $h, $h2;
1571 } 1602 }
1572 1603
1573 ($w, $h) 1604 ($w, $h)
1605 }
1574} 1606}
1575 1607
1576sub size_allocate { 1608sub size_allocate {
1577 my ($self, $w, $h) = @_; 1609 my ($self, $w, $h) = @_;
1578 1610
… …
1618 }; 1650 };
1619 1651
1620 glEnable GL_TEXTURE_2D; 1652 glEnable GL_TEXTURE_2D;
1621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1622 1654
1655 glColor_premultiply @{$self->{fg}}
1623 if ($tex->{format} == GL_ALPHA) { 1656 if $tex->{format} == GL_ALPHA;
1624 glColor @{$self->{fg}}; 1657
1625 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1626 } else {
1627 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1658 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1628 }
1629 1659
1630 glDisable GL_TEXTURE_2D; 1660 glDisable GL_TEXTURE_2D;
1631} 1661}
1632 1662
1633############################################################################# 1663#############################################################################
… …
1660 1690
1661 delete $self->{cur_h}; 1691 delete $self->{cur_h};
1662 1692
1663 return if $self->{text} eq $text; 1693 return if $self->{text} eq $text;
1664 1694
1665 delete $self->{texture};
1666
1667 $self->{last_activity} = $::NOW; 1695 $self->{last_activity} = $::NOW;
1668 $self->{text} = $text; 1696 $self->{text} = $text;
1669 1697
1670 $text =~ s/./*/g if $self->{hidden}; 1698 $text =~ s/./*/g if $self->{hidden};
1671 $self->{layout}->set_text ("$text "); 1699 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h};
1672 1701
1673 $self->_emit (changed => $self->{text}); 1702 $self->_emit (changed => $self->{text});
1703
1704 $self->realloc;
1705 $self->update;
1674} 1706}
1675 1707
1676sub set_text { 1708sub set_text {
1677 my ($self, $text) = @_; 1709 my ($self, $text) = @_;
1678 1710
1679 $self->{cursor} = length $text; 1711 $self->{cursor} = length $text;
1680 $self->_set_text ($text); 1712 $self->_set_text ($text);
1681
1682 $self->realloc;
1683} 1713}
1684 1714
1685sub get_text { 1715sub get_text {
1686 $_[0]{text} 1716 $_[0]{text}
1687} 1717}
… …
1767 my ($self) = @_; 1797 my ($self) = @_;
1768 1798
1769 local $self->{fg} = $self->{fg}; 1799 local $self->{fg} = $self->{fg};
1770 1800
1771 if ($FOCUS == $self) { 1801 if ($FOCUS == $self) {
1772 glColor @{$self->{active_bg}}; 1802 glColor_premultiply @{$self->{active_bg}};
1773 $self->{fg} = $self->{active_fg}; 1803 $self->{fg} = $self->{active_fg};
1774 } else { 1804 } else {
1775 glColor @{$self->{bg}}; 1805 glColor_premultiply @{$self->{bg}};
1776 } 1806 }
1777 1807
1778 glEnable GL_BLEND; 1808 glEnable GL_BLEND;
1779 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1809 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1780 glBegin GL_QUADS; 1810 glBegin GL_QUADS;
1781 glVertex 0 , 0; 1811 glVertex 0 , 0;
1782 glVertex 0 , $self->{h}; 1812 glVertex 0 , $self->{h};
1783 glVertex $self->{w}, $self->{h}; 1813 glVertex $self->{w}, $self->{h};
1784 glVertex $self->{w}, 0; 1814 glVertex $self->{w}, 0;
… …
1894} 1924}
1895 1925
1896sub _draw { 1926sub _draw {
1897 my ($self) = @_; 1927 my ($self) = @_;
1898 1928
1899 local $self->{fg} = $self->{fg}; 1929 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1900
1901 if ($GRAB == $self) {
1902 $self->{fg} = $self->{active_fg};
1903 }
1904 1930
1905 glEnable GL_TEXTURE_2D; 1931 glEnable GL_TEXTURE_2D;
1906 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1932 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1907 glColor 0, 0, 0, 1; 1933 glColor 0, 0, 0, 1;
1908 1934
… …
2133 2159
2134 my $h1 = $self->{h} * (1 - $ycut1); 2160 my $h1 = $self->{h} * (1 - $ycut1);
2135 my $h2 = $self->{h} * (1 - $ycut2); 2161 my $h2 = $self->{h} * (1 - $ycut2);
2136 2162
2137 glEnable GL_BLEND; 2163 glEnable GL_BLEND;
2138 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;
2139 glEnable GL_TEXTURE_2D; 2166 glEnable GL_TEXTURE_2D;
2140 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2167 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2141 2168
2142 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2169 glBindTexture GL_TEXTURE_2D, $t1->{name};
2143 glBegin GL_QUADS; 2170 glBegin GL_QUADS;
… …
2328} 2355}
2329 2356
2330sub update { 2357sub update {
2331 my ($self) = @_; 2358 my ($self) = @_;
2332 2359
2333 $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}) {
2334 $self->set_value ($self->{range}[0]); 2368 $self->set_value ($self->{range}[0]);
2335 2369
2336 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2370 my ($value, $lo, $hi, $page) = @{$self->{range}};
2337 my $range = ($hi - $page - $lo) || 1e-100; 2371 my $range = ($hi - $page - $lo) || 1e-100;
2338 2372
… …
2344 $value = ($value - $lo) / $range; 2378 $value = ($value - $lo) / $range;
2345 $value = $value * $self->{scale} + $self->{offset}; 2379 $value = $value * $self->{scale} + $self->{offset};
2346 2380
2347 $self->{knob_x} = $value - $knob_w * 0.5; 2381 $self->{knob_x} = $value - $knob_w * 0.5;
2348 $self->{knob_w} = $knob_w; 2382 $self->{knob_w} = $knob_w;
2349 }); 2383 }
2350
2351 $self->SUPER::update;
2352}
2353
2354sub _draw {
2355 my ($self) = @_;
2356 2384
2357 $self->SUPER::_draw (); 2385 $self->SUPER::_draw ();
2358 2386
2359 glScale $self->{w}, $self->{h}; 2387 glScale $self->{w}, $self->{h};
2360 2388
… …
2554 2582
2555 delete $self->{texture}; 2583 delete $self->{texture};
2556 } 2584 }
2557 2585
2558 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2586 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2559 glClearColor 0.5, 0.5, 0.5, 0; 2587 glClearColor 0, 0, 0, 0;
2560 glClear GL_COLOR_BUFFER_BIT; 2588 glClear GL_COLOR_BUFFER_BIT;
2561 2589
2562 my $top = int $self->{children}[1]{range}[0]; 2590 my $top = int $self->{children}[1]{range}[0];
2563 2591
2564 my $y0 = $top; 2592 my $y0 = $top;
… …
2599sub _draw { 2627sub _draw {
2600 my ($self) = @_; 2628 my ($self) = @_;
2601 2629
2602 glEnable GL_TEXTURE_2D; 2630 glEnable GL_TEXTURE_2D;
2603 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2631 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2604 glColor 1, 1, 1, 1; 2632 glColor 0, 0, 0, 1;
2605 $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});
2606 glDisable GL_TEXTURE_2D; 2634 glDisable GL_TEXTURE_2D;
2607 2635
2608 $self->{children}[1]->draw; 2636 $self->{children}[1]->draw;
2609 2637
2610} 2638}
… …
2837 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2865 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2838 2866
2839 if ($tex) { 2867 if ($tex) {
2840 glEnable GL_TEXTURE_2D; 2868 glEnable GL_TEXTURE_2D;
2841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2842 glColor 1, 1, 1, 1; 2870 glColor 0, 0, 0, 1;
2843 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2844 glDisable GL_TEXTURE_2D; 2872 glDisable GL_TEXTURE_2D;
2845 } 2873 }
2846} 2874}
2847 2875
… …
2851 $self->{timer}->cancel 2879 $self->{timer}->cancel
2852 if $self->{timer}; 2880 if $self->{timer};
2853 2881
2854 $self->SUPER::DESTROY; 2882 $self->SUPER::DESTROY;
2855} 2883}
2884
2885#############################################################################
2886
2887package CFClient::UI::Buttonbar;
2888
2889our @ISA = CFClient::UI::HBox::;
2890
2891# TODO: should actualyl wrap buttons and other goodies.
2856 2892
2857############################################################################# 2893#############################################################################
2858 2894
2859package CFClient::UI::Menu; 2895package CFClient::UI::Menu;
2860 2896
… …
2932 1 2968 1
2933} 2969}
2934 2970
2935############################################################################# 2971#############################################################################
2936 2972
2937package CFClient::UI::Statusbox; 2973package CFClient::UI::Multiplexer;
2938 2974
2939our @ISA = CFClient::UI::VBox::; 2975our @ISA = CFClient::UI::Container::;
2940 2976
2941sub new { 2977sub new {
2942 my $class = shift; 2978 my $class = shift;
2943 2979
2944 $class->SUPER::new ( 2980 my $self = $class->SUPER::new (
2981 @_,
2982 );
2983
2984 $self->{current} = $self->{children}[0]
2985 if @{ $self->{children} };
2986
2987 $self
2988}
2989
2990sub add {
2991 my ($self, @widgets) = @_;
2992
2993 $self->SUPER::add (@widgets);
2994
2995 $self->{current} = $self->{children}[0]
2996 if @{ $self->{children} };
2997}
2998
2999sub set_current_page {
3000 my ($self, $page_or_widget) = @_;
3001
3002 my $widget = ref $page_or_widget
3003 ? $page_or_widget
3004 : $self->{children}[$page_or_widget];
3005
3006 $self->{current} = $widget;
3007 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3008
3009 $self->_emit (page_changed => $self->{current});
3010
3011 $self->realloc;
3012}
3013
3014sub visible_children {
3015 $_[0]{current}
3016}
3017
3018sub size_request {
3019 my ($self) = @_;
3020
3021 $self->{current}->size_request
3022}
3023
3024sub size_allocate {
3025 my ($self, $w, $h) = @_;
3026
3027 $self->{current}->configure (0, 0, $w, $h);
3028}
3029
3030sub _draw {
3031 my ($self) = @_;
3032
3033 $self->{current}->draw;
3034}
3035
3036#############################################################################
3037
3038package CFClient::UI::Notebook;
3039
3040our @ISA = CFClient::UI::VBox::;
3041
3042sub new {
3043 my $class = shift;
3044
3045 my $self = $class->SUPER::new (
3046 buttonbar => (new CFClient::UI::Buttonbar),
3047 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3048 # filter => # will be put between multiplexer and $self
3049 @_,
3050 );
3051
3052 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3053 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3054
3055 $self
3056}
3057
3058sub add {
3059 my ($self, $title, $widget, $tooltip) = @_;
3060
3061 Scalar::Util::weaken $self;
3062
3063 $self->{buttonbar}->add (new CFClient::UI::Button
3064 markup => $title,
3065 tooltip => $tooltip,
3066 on_activate => sub { $self->set_current_page ($widget) },
3067 );
3068
3069 $self->{multiplexer}->add ($widget);
3070}
3071
3072sub set_current_page {
3073 my ($self, $page) = @_;
3074
3075 $self->{multiplexer}->set_current_page ($page);
3076 $self->_emit (page_changed => $self->{multiplexer}{current});
3077}
3078
3079#############################################################################
3080
3081package CFClient::UI::Statusbox;
3082
3083our @ISA = CFClient::UI::VBox::;
3084
3085sub new {
3086 my $class = shift;
3087
3088 my $self = $class->SUPER::new (
2945 fontsize => 0.8, 3089 fontsize => 0.8,
2946 @_, 3090 @_,
2947 ) 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
2948} 3098}
2949 3099
2950sub reorder { 3100sub reorder {
2951 my ($self) = @_; 3101 my ($self) = @_;
2952 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} };
2953 3108
2954 while (my ($k, $v) = each %{ $self->{item} }) { 3109 while (my ($k, $v) = each %{ $self->{item} }) {
2955 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3110 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2956 } 3111 }
2957 3112
… …
2960 my @items = sort { 3115 my @items = sort {
2961 $a->{pri} <=> $b->{pri} 3116 $a->{pri} <=> $b->{pri}
2962 or $b->{id} <=> $a->{id} 3117 or $b->{id} <=> $a->{id}
2963 } values %{ $self->{item} }; 3118 } values %{ $self->{item} };
2964 3119
3120 $self->{timer}->interval (1);
3121
2965 my $count = 10 + 1; 3122 my $count = 10 + 1;
2966 for my $item (@items) { 3123 for my $item (@items) {
2967 last unless --$count; 3124 last unless --$count;
2968 3125
2969 push @widgets, $item->{label} ||= do { 3126 my $label = $item->{label} ||= do {
2970 # TODO: doesn't handle markup well (read as: at all) 3127 # TODO: doesn't handle markup well (read as: at all)
2971 my $short = $item->{count} > 1 3128 my $short = $item->{count} > 1
2972 ? "<b>$item->{count} ×</b> $item->{text}" 3129 ? "<b>$item->{count} ×</b> $item->{text}"
2973 : $item->{text}; 3130 : $item->{text};
2974 3131
… …
2982 tooltip => $item->{tooltip}, 3139 tooltip => $item->{tooltip},
2983 tooltip_font => $::FONT_PROP, 3140 tooltip_font => $::FONT_PROP,
2984 tooltip_width => 0.67, 3141 tooltip_width => 0.67,
2985 fontsize => $item->{fontsize} || $self->{fontsize}, 3142 fontsize => $item->{fontsize} || $self->{fontsize},
2986 max_w => $::WIDTH * 0.44, 3143 max_w => $::WIDTH * 0.44,
2987 fg => $item->{fg}, 3144 fg => [@{ $item->{fg} }],
2988 can_events => 1, 3145 can_events => 1,
2989 can_hover => 1 3146 can_hover => 1
2990 }; 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;
2991 } 3160 }
2992 3161
2993 $self->clear; 3162 $self->clear;
2994 $self->SUPER::add (reverse @widgets); 3163 $self->SUPER::add (reverse @widgets);
2995} 3164}
… …
3000 $text =~ s/^\s+//; 3169 $text =~ s/^\s+//;
3001 $text =~ s/\s+$//; 3170 $text =~ s/\s+$//;
3002 3171
3003 return unless $text; 3172 return unless $text;
3004 3173
3005 my $timeout = time + ((delete $arg{timeout}) || 60); 3174 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3006 3175
3007 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3176 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3008 3177
3009 if (my $item = $self->{item}{$group}) { 3178 if (my $item = $self->{item}{$group}) {
3010 if ($item->{text} eq $text) { 3179 if ($item->{text} eq $text) {
… …
3040 3209
3041 $self->reorder; 3210 $self->reorder;
3042 $self->SUPER::reconfigure; 3211 $self->SUPER::reconfigure;
3043} 3212}
3044 3213
3214sub DESTROY {
3215 my ($self) = @_;
3216
3217 $self->{timer}->cancel;
3218
3219 $self->SUPER::DESTROY;
3220}
3221
3045############################################################################# 3222#############################################################################
3046 3223
3047package CFClient::UI::Inventory; 3224package CFClient::UI::Inventory;
3048 3225
3049our @ISA = CFClient::UI::ScrolledWindow::; 3226our @ISA = CFClient::UI::ScrolledWindow::;
3050 3227
3051sub new { 3228sub new {
3052 my $class = shift; 3229 my $class = shift;
3053 3230
3054 my $self = $class->SUPER::new ( 3231 my $self = $class->SUPER::new (
3055 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3232 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3056 @_, 3233 @_,
3057 ); 3234 );
3058 3235
3059 $self 3236 $self
3060} 3237}
3061 3238
3062sub set_items { 3239sub set_items {
3063 my ($self, $items) = @_; 3240 my ($self, $items) = @_;
3064 3241
3065 $self->{scrolled}->clear; 3242 $self->{child}->clear;
3066 return unless $items; 3243 return unless $items;
3067 3244
3068 my @items = sort { 3245 my @items = sort {
3069 ($a->{type} <=> $b->{type}) 3246 ($a->{type} <=> $b->{type})
3070 or ($a->{name} cmp $b->{name}) 3247 or ($a->{name} cmp $b->{name})
… …
3074 3251
3075 my $row = 0; 3252 my $row = 0;
3076 for my $item (@items) { 3253 for my $item (@items) {
3077 CFClient::Item::update_widgets $item; 3254 CFClient::Item::update_widgets $item;
3078 3255
3079 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3256 $self->{child}->add (0, $row, $item->{face_widget});
3080 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3257 $self->{child}->add (1, $row, $item->{desc_widget});
3081 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3258 $self->{child}->add (2, $row, $item->{weight_widget});
3082 3259
3083 $row++; 3260 $row++;
3084 } 3261 }
3085} 3262}
3086 3263
… …
3283 3460
3284############################################################################# 3461#############################################################################
3285 3462
3286package CFClient::UI::SpellList; 3463package CFClient::UI::SpellList;
3287 3464
3288our @ISA = CFClient::UI::FancyFrame::; 3465our @ISA = CFClient::UI::Table::;
3289 3466
3290sub new { 3467sub new {
3291 my $class = shift; 3468 my $class = shift;
3292 3469
3293 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3470 my $self = $class->SUPER::new (
3294 3471 binding => [],
3295 $self->add (new CFClient::UI::ScrolledWindow 3472 commands => [],
3296 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3473 @_,
3297 3474 )
3298 $self;
3299} 3475}
3300 3476
3301# XXX: Do sorting? Argl... 3477# XXX: Do sorting? Argl...
3302sub add_spell { 3478sub add_spell {
3303 my ($self, $spell) = @_; 3479 my ($self, $spell) = @_;
3304 $self->{spells}->{$spell->{name}} = $spell; 3480 $self->{spells}->{$spell->{name}} = $spell;
3305 3481
3306 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face 3482 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3307 face => $spell->{face}, 3483 face => $spell->{face},
3308 can_hover => 1, 3484 can_hover => 1,
3309 can_events => 1, 3485 can_events => 1,
3310 tooltip => $spell->{message}); 3486 tooltip => $spell->{message});
3311 3487
3312 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label 3488 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3313 text => $spell->{name}, 3489 text => $spell->{name},
3314 can_hover => 1, 3490 can_hover => 1,
3315 can_events => 1, 3491 can_events => 1,
3316 tooltip => $spell->{message}, 3492 tooltip => $spell->{message},
3317 expand => 1); 3493 expand => 1);
3318 3494
3319 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label 3495 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3320 text => (sprintf "lvl: %2d sp: %2d dmg: %2d", 3496 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3321 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}), 3497 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3322 expand => 1); 3498 expand => 1);
3323 3499
3324 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button 3500 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3325 text => "bind to key", 3501 text => "bind to key",
3326 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }); 3502 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3327} 3503}
3328 3504
3329sub rebuild_spell_list { 3505sub rebuild_spell_list {
… …
3341############################################################################# 3517#############################################################################
3342 3518
3343package CFClient::UI::Root; 3519package CFClient::UI::Root;
3344 3520
3345our @ISA = CFClient::UI::Container::; 3521our @ISA = CFClient::UI::Container::;
3522
3523use List::Util qw(min max);
3346 3524
3347use CFClient::OpenGL; 3525use CFClient::OpenGL;
3348 3526
3349sub new { 3527sub new {
3350 my $class = shift; 3528 my $class = shift;
… …
3485 3663
3486 delete $queue{$widget+0}; 3664 delete $queue{$widget+0};
3487 3665
3488 my ($w, $h) = $widget->size_request; 3666 my ($w, $h) = $widget->size_request;
3489 3667
3490 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3668 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3491 $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};
3492 3673
3493 $w = $widget->{force_w} if exists $widget->{force_w}; 3674 $w = $widget->{force_w} if exists $widget->{force_w};
3494 $h = $widget->{force_h} if exists $widget->{force_h}; 3675 $h = $widget->{force_h} if exists $widget->{force_h};
3495 3676
3496 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