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.270 by elmex, Fri Jun 2 09:02:49 2006 UTC vs.
Revision 1.282 by root, Mon Jun 5 02:25:10 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
… …
439 446
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 447 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441 unless $FOCUS; 448 unless $FOCUS;
442} 449}
443 450
444sub mouse_motion { } 451sub mouse_motion { 0 }
445sub button_up { } 452sub button_up { 0 }
446sub key_down { } 453sub key_down { 0 }
447sub key_up { } 454sub key_up { 0 }
448 455
449sub button_down { 456sub button_down {
450 my ($self, $ev, $x, $y) = @_; 457 my ($self, $ev, $x, $y) = @_;
451 458
452 $self->focus_in; 459 $self->focus_in;
460
461 0
453} 462}
454 463
455sub find_widget { 464sub find_widget {
456 my ($self, $x, $y) = @_; 465 my ($self, $x, $y) = @_;
457 466
… …
541 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
542 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
543 552
544 glPushMatrix; 553 glPushMatrix;
545 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
546 $self->_draw;
547 glPopMatrix;
548 555
549 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
550 my ($x, $y) = @$self{qw(x y)};
551
552 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
553 glEnable GL_BLEND; 558 glEnable GL_BLEND;
554 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
555 glBegin GL_QUADS; 560 glBegin GL_QUADS;
556 glVertex $x , $y; 561 glVertex 0 , 0;
557 glVertex $x + $self->{w}, $y; 562 glVertex $self->{w}, 0;
558 glVertex $x + $self->{w}, $y + $self->{h}; 563 glVertex $self->{w}, $self->{h};
559 glVertex $x , $y + $self->{h}; 564 glVertex 0 , $self->{h};
560 glEnd; 565 glEnd;
561 glDisable GL_BLEND; 566 glDisable GL_BLEND;
562 } 567 }
563 568
564 if ($ENV{CFPLUS_DEBUG} & 1) { 569 if ($ENV{CFPLUS_DEBUG} & 1) {
565 glPushMatrix; 570 glPushMatrix;
566 glColor 1, 1, 0, 1; 571 glColor 1, 1, 0, 1;
567 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 572 glTranslate 0.375, 0.375;
568 glBegin GL_LINE_LOOP; 573 glBegin GL_LINE_LOOP;
569 glVertex 0 , 0; 574 glVertex 0 , 0;
570 glVertex $self->{w} - 1, 0; 575 glVertex $self->{w} - 1, 0;
571 glVertex $self->{w} - 1, $self->{h} - 1; 576 glVertex $self->{w} - 1, $self->{h} - 1;
572 glVertex 0 , $self->{h} - 1; 577 glVertex 0 , $self->{h} - 1;
573 glEnd; 578 glEnd;
574 glPopMatrix; 579 glPopMatrix;
575 #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;
576 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
577} 585}
578 586
579sub _draw { 587sub _draw {
580 my ($self) = @_; 588 my ($self) = @_;
581 589
… …
619 627
620 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
621 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
622 630
623 glEnable GL_BLEND; 631 glEnable GL_BLEND;
624 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
625 glColor @$color; 633 glColor_premultiply @$color;
626 634
627 glBegin GL_QUADS; 635 glBegin GL_QUADS;
628 glVertex 0 , 0; 636 glVertex 0 , 0;
629 glVertex 0 , $h; 637 glVertex 0 , $h;
630 glVertex $w, $h; 638 glVertex $w, $h;
… …
661our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
662 670
663sub new { 671sub new {
664 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
665 673
666 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
667 675
668 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
669 children => [], 677 children => [],
670 can_events => 0, 678 can_events => 0,
671 %arg, 679 %arg,
672 ); 680 );
681
673 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
674 684
675 $self 685 $self
676} 686}
677 687
678sub add { 688sub add {
… …
726 $x -= $self->{x}; 736 $x -= $self->{x};
727 $y -= $self->{y}; 737 $y -= $self->{y};
728 738
729 my $res; 739 my $res;
730 740
731 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
732 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
733 and return $res; 743 and return $res;
734 } 744 }
735 745
736 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
785 $self->{children}[0]->configure (0, 0, $w, $h); 795 $self->{children}[0]->configure (0, 0, $w, $h);
786} 796}
787 797
788############################################################################# 798#############################################################################
789 799
800# back-buffered drawing area
801
790package CFClient::UI::Window; 802package CFClient::UI::Window;
791 803
792our @ISA = CFClient::UI::Bin::; 804our @ISA = CFClient::UI::Bin::;
793 805
794use CFClient::OpenGL; 806use CFClient::OpenGL;
… …
845 my $tex = $self->{texture} 857 my $tex = $self->{texture}
846 or return; 858 or return;
847 859
848 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
849 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
850 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
851 863
852 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
853 865
854 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
855} 867}
… …
946package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
947 959
948our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
949 961
950sub new { 962sub new {
951 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
952 966
953 my $self; 967 my $self;
954 968
955 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
956 vertical => 1, 970 vertical => 1,
… …
961 ; 975 ;
962 976
963 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
964 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
965 slider => $slider, 979 slider => $slider,
966 @_, 980 %arg,
967 ); 981 );
968 982
969 $self->{vp}->add ($self->{scrolled});
970 $self->add ($self->{vp});
971 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
972 985
973 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
974} 993}
975 994
976sub update { 995sub update {
977 my ($self) = @_; 996 my ($self) = @_;
978 997
… …
1017 1036
1018 if ($self->{bg}) { 1037 if ($self->{bg}) {
1019 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
1020 1039
1021 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
1022 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1023 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
1024 1043
1025 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
1026 glVertex 0 , 0; 1045 glVertex 0 , 0;
1027 glVertex 0 , $h; 1046 glVertex 0 , $h;
1028 glVertex $w, $h; 1047 glVertex $w, $h;
… …
1142 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1143 1162
1144 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1145 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1146 1165
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1147 $self->realloc; 1167 $self->realloc;
1148 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1149 }; 1168 };
1150 1169
1151 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1152 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1153 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1156 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1157 1176
1158 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1159 1178
1160 $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});
1161 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1162 } 1187 1
1163} 1188}
1164 1189
1165sub button_up { 1190sub button_up {
1166 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1167 1192
1168 delete $self->{motion}; 1193 !!delete $self->{motion}
1169} 1194}
1170 1195
1171sub mouse_motion { 1196sub mouse_motion {
1172 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1173 1198
1174 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1175} 1202}
1176 1203
1177sub _draw { 1204sub _draw {
1178 my ($self) = @_; 1205 my ($self) = @_;
1179 1206
… …
1511 1538
1512 delete $self->{texture}; 1539 delete $self->{texture};
1513 $self->SUPER::update; 1540 $self->SUPER::update;
1514} 1541}
1515 1542
1543sub realloc {
1544 my ($self) = @_;
1545
1546 delete $self->{ox};
1547 delete $self->{req_h};
1548 $self->SUPER::realloc;
1549}
1550
1516sub set_text { 1551sub set_text {
1517 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1518 1553
1519 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1520 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
… …
1542} 1577}
1543 1578
1544sub size_request { 1579sub size_request {
1545 my ($self) = @_; 1580 my ($self) = @_;
1546 1581
1582 if (exists $self->{req_h}) {
1583 @$self{qw(req_w req_h)}
1584 } else {
1547 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1548 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1549 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552 1590
1553 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1554 1592
1555 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1556 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1557 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1558 1596
1559 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1560 1598
1561 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1562 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1563 } 1601 }
1564 1602
1565 ($w, $h) 1603 ($w, $h)
1604 }
1566} 1605}
1567 1606
1568sub size_allocate { 1607sub size_allocate {
1569 my ($self, $w, $h) = @_; 1608 my ($self, $w, $h) = @_;
1570 1609
… …
1610 }; 1649 };
1611 1650
1612 glEnable GL_TEXTURE_2D; 1651 glEnable GL_TEXTURE_2D;
1613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1652 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1614 1653
1654 glColor_premultiply @{$self->{fg}}
1615 if ($tex->{format} == GL_ALPHA) { 1655 if $tex->{format} == GL_ALPHA;
1616 glColor @{$self->{fg}}; 1656
1617 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1618 } else {
1619 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1657 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1620 }
1621 1658
1622 glDisable GL_TEXTURE_2D; 1659 glDisable GL_TEXTURE_2D;
1623} 1660}
1624 1661
1625############################################################################# 1662#############################################################################
… …
1652 1689
1653 delete $self->{cur_h}; 1690 delete $self->{cur_h};
1654 1691
1655 return if $self->{text} eq $text; 1692 return if $self->{text} eq $text;
1656 1693
1657 delete $self->{texture};
1658
1659 $self->{last_activity} = $::NOW; 1694 $self->{last_activity} = $::NOW;
1660 $self->{text} = $text; 1695 $self->{text} = $text;
1661 1696
1662 $text =~ s/./*/g if $self->{hidden}; 1697 $text =~ s/./*/g if $self->{hidden};
1663 $self->{layout}->set_text ("$text "); 1698 $self->{layout}->set_text ("$text ");
1664 1699
1665 $self->_emit (changed => $self->{text}); 1700 $self->_emit (changed => $self->{text});
1701 $self->update;
1666} 1702}
1667 1703
1668sub set_text { 1704sub set_text {
1669 my ($self, $text) = @_; 1705 my ($self, $text) = @_;
1670 1706
… …
1709 $self->{cursor} = length $text; 1745 $self->{cursor} = length $text;
1710 } elsif ($uni == 27) { 1746 } elsif ($uni == 27) {
1711 $self->_emit ('escape'); 1747 $self->_emit ('escape');
1712 } elsif ($uni) { 1748 } elsif ($uni) {
1713 substr $text, $self->{cursor}++, 0, chr $uni; 1749 substr $text, $self->{cursor}++, 0, chr $uni;
1750 } else {
1751 return 0;
1714 } 1752 }
1715 1753
1716 $self->_set_text ($text); 1754 $self->_set_text ($text);
1717 1755
1718 $self->realloc; 1756 $self->realloc;
1757
1758 1
1719} 1759}
1720 1760
1721sub focus_in { 1761sub focus_in {
1722 my ($self) = @_; 1762 my ($self) = @_;
1723 1763
… …
1738 utf8::encode $text; 1778 utf8::encode $text;
1739 $self->{cursor} = length substr $text, 0, $idx; 1779 $self->{cursor} = length substr $text, 0, $idx;
1740 1780
1741 $self->_set_text ($self->{text}); 1781 $self->_set_text ($self->{text});
1742 $self->update; 1782 $self->update;
1783
1784 1
1743} 1785}
1744 1786
1745sub mouse_motion { 1787sub mouse_motion {
1746 my ($self, $ev, $x, $y) = @_; 1788 my ($self, $ev, $x, $y) = @_;
1747# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1789# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1790
1791 0
1748} 1792}
1749 1793
1750sub _draw { 1794sub _draw {
1751 my ($self) = @_; 1795 my ($self) = @_;
1752 1796
1753 local $self->{fg} = $self->{fg}; 1797 local $self->{fg} = $self->{fg};
1754 1798
1755 if ($FOCUS == $self) { 1799 if ($FOCUS == $self) {
1756 glColor @{$self->{active_bg}}; 1800 glColor_premultiply @{$self->{active_bg}};
1757 $self->{fg} = $self->{active_fg}; 1801 $self->{fg} = $self->{active_fg};
1758 } else { 1802 } else {
1759 glColor @{$self->{bg}}; 1803 glColor_premultiply @{$self->{bg}};
1760 } 1804 }
1761 1805
1762 glEnable GL_BLEND; 1806 glEnable GL_BLEND;
1763 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1807 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1764 glBegin GL_QUADS; 1808 glBegin GL_QUADS;
1765 glVertex 0 , 0; 1809 glVertex 0 , 0;
1766 glVertex 0 , $self->{h}; 1810 glVertex 0 , $self->{h};
1767 glVertex $self->{w}, $self->{h}; 1811 glVertex $self->{w}, $self->{h};
1768 glVertex $self->{w}, 0; 1812 glVertex $self->{w}, 0;
… …
1829 } else { 1873 } else {
1830 $self->set_text ($self->{history_saveback}); 1874 $self->set_text ($self->{history_saveback});
1831 } 1875 }
1832 1876
1833 } else { 1877 } else {
1834 $self->SUPER::key_down ($ev); 1878 return $self->SUPER::key_down ($ev)
1879 }
1880
1835 } 1881 1
1836
1837} 1882}
1838 1883
1839############################################################################# 1884#############################################################################
1840 1885
1841package CFClient::UI::Button; 1886package CFClient::UI::Button;
… …
1870 my ($self, $ev, $x, $y) = @_; 1915 my ($self, $ev, $x, $y) = @_;
1871 1916
1872 $self->emit ("activate") 1917 $self->emit ("activate")
1873 if $x >= 0 && $x < $self->{w} 1918 if $x >= 0 && $x < $self->{w}
1874 && $y >= 0 && $y < $self->{h}; 1919 && $y >= 0 && $y < $self->{h};
1920
1921 1
1875} 1922}
1876 1923
1877sub _draw { 1924sub _draw {
1878 my ($self) = @_; 1925 my ($self) = @_;
1879 1926
1880 local $self->{fg} = $self->{fg}; 1927 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1881
1882 if ($GRAB == $self) {
1883 $self->{fg} = $self->{active_fg};
1884 }
1885 1928
1886 glEnable GL_TEXTURE_2D; 1929 glEnable GL_TEXTURE_2D;
1887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1930 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1888 glColor 0, 0, 0, 1; 1931 glColor 0, 0, 0, 1;
1889 1932
… …
1933 1976
1934 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 1977 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1935 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 1978 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1936 $self->{state} = !$self->{state}; 1979 $self->{state} = !$self->{state};
1937 $self->_emit (changed => $self->{state}); 1980 $self->_emit (changed => $self->{state});
1981 } else {
1982 return 0
1983 }
1984
1938 } 1985 1
1939} 1986}
1940 1987
1941sub _draw { 1988sub _draw {
1942 my ($self) = @_; 1989 my ($self) = @_;
1943 1990
… …
2110 2157
2111 my $h1 = $self->{h} * (1 - $ycut1); 2158 my $h1 = $self->{h} * (1 - $ycut1);
2112 my $h2 = $self->{h} * (1 - $ycut2); 2159 my $h2 = $self->{h} * (1 - $ycut2);
2113 2160
2114 glEnable GL_BLEND; 2161 glEnable GL_BLEND;
2115 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2162 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2163 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2116 glEnable GL_TEXTURE_2D; 2164 glEnable GL_TEXTURE_2D;
2117 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2165 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118 2166
2119 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2167 glBindTexture GL_TEXTURE_2D, $t1->{name};
2120 glBegin GL_QUADS; 2168 glBegin GL_QUADS;
… …
2281 2329
2282 $self->SUPER::button_down ($ev, $x, $y); 2330 $self->SUPER::button_down ($ev, $x, $y);
2283 2331
2284 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2332 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2285 2333
2286 $self->mouse_motion ($ev, $x, $y); 2334 $self->mouse_motion ($ev, $x, $y)
2287} 2335}
2288 2336
2289sub mouse_motion { 2337sub mouse_motion {
2290 my ($self, $ev, $x, $y) = @_; 2338 my ($self, $ev, $x, $y) = @_;
2291 2339
… …
2295 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2343 my (undef, $lo, $hi, $page) = @{$self->{range}};
2296 2344
2297 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2345 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2298 2346
2299 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2347 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2348 } else {
2349 return 0;
2350 }
2351
2300 } 2352 1
2301} 2353}
2302 2354
2303sub update { 2355sub update {
2304 my ($self) = @_; 2356 my ($self) = @_;
2305 2357
2306 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2358 delete $self->{knob_w};
2359 $self->SUPER::update;
2360}
2361
2362sub _draw {
2363 my ($self) = @_;
2364
2365 unless ($self->{knob_w}) {
2307 $self->set_value ($self->{range}[0]); 2366 $self->set_value ($self->{range}[0]);
2308 2367
2309 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2368 my ($value, $lo, $hi, $page) = @{$self->{range}};
2310 my $range = ($hi - $page - $lo) || 1e-100; 2369 my $range = ($hi - $page - $lo) || 1e-100;
2311 2370
… …
2317 $value = ($value - $lo) / $range; 2376 $value = ($value - $lo) / $range;
2318 $value = $value * $self->{scale} + $self->{offset}; 2377 $value = $value * $self->{scale} + $self->{offset};
2319 2378
2320 $self->{knob_x} = $value - $knob_w * 0.5; 2379 $self->{knob_x} = $value - $knob_w * 0.5;
2321 $self->{knob_w} = $knob_w; 2380 $self->{knob_w} = $knob_w;
2322 }); 2381 }
2323
2324 $self->SUPER::update;
2325}
2326
2327sub _draw {
2328 my ($self) = @_;
2329 2382
2330 $self->SUPER::_draw (); 2383 $self->SUPER::_draw ();
2331 2384
2332 glScale $self->{w}, $self->{h}; 2385 glScale $self->{w}, $self->{h};
2333 2386
… …
2527 2580
2528 delete $self->{texture}; 2581 delete $self->{texture};
2529 } 2582 }
2530 2583
2531 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2584 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2532 glClearColor 0.5, 0.5, 0.5, 0; 2585 glClearColor 0, 0, 0, 0;
2533 glClear GL_COLOR_BUFFER_BIT; 2586 glClear GL_COLOR_BUFFER_BIT;
2534 2587
2535 my $top = int $self->{children}[1]{range}[0]; 2588 my $top = int $self->{children}[1]{range}[0];
2536 2589
2537 my $y0 = $top; 2590 my $y0 = $top;
… …
2572sub _draw { 2625sub _draw {
2573 my ($self) = @_; 2626 my ($self) = @_;
2574 2627
2575 glEnable GL_TEXTURE_2D; 2628 glEnable GL_TEXTURE_2D;
2576 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2577 glColor 1, 1, 1, 1; 2630 glColor 0, 0, 0, 1;
2578 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2631 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2579 glDisable GL_TEXTURE_2D; 2632 glDisable GL_TEXTURE_2D;
2580 2633
2581 $self->{children}[1]->draw; 2634 $self->{children}[1]->draw;
2582 2635
2583} 2636}
… …
2810 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2863 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2811 2864
2812 if ($tex) { 2865 if ($tex) {
2813 glEnable GL_TEXTURE_2D; 2866 glEnable GL_TEXTURE_2D;
2814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2867 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2815 glColor 1, 1, 1, 1; 2868 glColor 0, 0, 0, 1;
2816 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2869 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2817 glDisable GL_TEXTURE_2D; 2870 glDisable GL_TEXTURE_2D;
2818 } 2871 }
2819} 2872}
2820 2873
… …
2824 $self->{timer}->cancel 2877 $self->{timer}->cancel
2825 if $self->{timer}; 2878 if $self->{timer};
2826 2879
2827 $self->SUPER::DESTROY; 2880 $self->SUPER::DESTROY;
2828} 2881}
2882
2883#############################################################################
2884
2885package CFClient::UI::Buttonbar;
2886
2887our @ISA = CFClient::UI::HBox::;
2888
2889# TODO: should actualyl wrap buttons and other goodies.
2829 2890
2830############################################################################# 2891#############################################################################
2831 2892
2832package CFClient::UI::Menu; 2893package CFClient::UI::Menu;
2833 2894
… …
2883 my ($self, $ev, $x, $y) = @_; 2944 my ($self, $ev, $x, $y) = @_;
2884 2945
2885 # TODO: should use vbox->find_widget or so 2946 # TODO: should use vbox->find_widget or so
2886 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2947 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2887 $self->{hover} = $self->{item}{$HOVER}; 2948 $self->{hover} = $self->{item}{$HOVER};
2949
2950 0
2888} 2951}
2889 2952
2890sub button_up { 2953sub button_up {
2891 my ($self, $ev, $x, $y) = @_; 2954 my ($self, $ev, $x, $y) = @_;
2892 2955
… …
2894 undef $GRAB; 2957 undef $GRAB;
2895 $self->hide; 2958 $self->hide;
2896 2959
2897 $self->_emit ("popdown"); 2960 $self->_emit ("popdown");
2898 $self->{hover}[1]->() if $self->{hover}; 2961 $self->{hover}[1]->() if $self->{hover};
2962 } else {
2963 return 0
2964 }
2965
2899 } 2966 1
2900} 2967}
2901 2968
2902############################################################################# 2969#############################################################################
2903 2970
2904package CFClient::UI::Statusbox; 2971package CFClient::UI::Multiplexer;
2905 2972
2906our @ISA = CFClient::UI::VBox::; 2973our @ISA = CFClient::UI::Container::;
2907 2974
2908sub new { 2975sub new {
2909 my $class = shift; 2976 my $class = shift;
2910 2977
2911 $class->SUPER::new ( 2978 my $self = $class->SUPER::new (
2979 @_,
2980 );
2981
2982 $self->{current} = $self->{children}[0]
2983 if @{ $self->{children} };
2984
2985 $self
2986}
2987
2988sub add {
2989 my ($self, @widgets) = @_;
2990
2991 $self->SUPER::add (@widgets);
2992
2993 $self->{current} = $self->{children}[0]
2994 if @{ $self->{children} };
2995}
2996
2997sub set_current_page {
2998 my ($self, $page_or_widget) = @_;
2999
3000 my $widget = ref $page_or_widget
3001 ? $page_or_widget
3002 : $self->{children}[$page_or_widget];
3003
3004 $self->{current} = $widget;
3005 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3006
3007 $self->_emit (page_changed => $self->{current});
3008
3009 $self->realloc;
3010}
3011
3012sub visible_children {
3013 $_[0]{current}
3014}
3015
3016sub size_request {
3017 my ($self) = @_;
3018
3019 $self->{current}->size_request
3020}
3021
3022sub size_allocate {
3023 my ($self, $w, $h) = @_;
3024
3025 $self->{current}->configure (0, 0, $w, $h);
3026}
3027
3028sub _draw {
3029 my ($self) = @_;
3030
3031 $self->{current}->draw;
3032}
3033
3034#############################################################################
3035
3036package CFClient::UI::Notebook;
3037
3038our @ISA = CFClient::UI::VBox::;
3039
3040sub new {
3041 my $class = shift;
3042
3043 my $self = $class->SUPER::new (
3044 buttonbar => (new CFClient::UI::Buttonbar),
3045 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3046 # filter => # will be put between multiplexer and $self
3047 @_,
3048 );
3049
3050 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3051 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3052
3053 $self
3054}
3055
3056sub add {
3057 my ($self, $title, $widget, $tooltip) = @_;
3058
3059 Scalar::Util::weaken $self;
3060
3061 $self->{buttonbar}->add (new CFClient::UI::Button
3062 markup => $title,
3063 tooltip => $tooltip,
3064 on_activate => sub { $self->set_current_page ($widget) },
3065 );
3066
3067 $self->{multiplexer}->add ($widget);
3068}
3069
3070sub set_current_page {
3071 my ($self, $page) = @_;
3072
3073 $self->{multiplexer}->set_current_page ($page);
3074 $self->_emit (page_changed => $self->{multiplexer}{current});
3075}
3076
3077#############################################################################
3078
3079package CFClient::UI::Statusbox;
3080
3081our @ISA = CFClient::UI::VBox::;
3082
3083sub new {
3084 my $class = shift;
3085
3086 my $self = $class->SUPER::new (
2912 fontsize => 0.8, 3087 fontsize => 0.8,
2913 @_, 3088 @_,
2914 ) 3089 );
3090
3091 Scalar::Util::weaken (my $this = $self);
3092
3093 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3094
3095 $self
2915} 3096}
2916 3097
2917sub reorder { 3098sub reorder {
2918 my ($self) = @_; 3099 my ($self) = @_;
2919 my $NOW = time; 3100 my $NOW = Time::HiRes::time;
3101
3102 # freeze display when hovering over any label
3103 return if $CFClient::UI::TOOLTIP->{owner}
3104 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3105 values %{ $self->{item} };
2920 3106
2921 while (my ($k, $v) = each %{ $self->{item} }) { 3107 while (my ($k, $v) = each %{ $self->{item} }) {
2922 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3108 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923 } 3109 }
2924 3110
… …
2927 my @items = sort { 3113 my @items = sort {
2928 $a->{pri} <=> $b->{pri} 3114 $a->{pri} <=> $b->{pri}
2929 or $b->{id} <=> $a->{id} 3115 or $b->{id} <=> $a->{id}
2930 } values %{ $self->{item} }; 3116 } values %{ $self->{item} };
2931 3117
3118 $self->{timer}->interval (1);
3119
2932 my $count = 10 + 1; 3120 my $count = 10 + 1;
2933 for my $item (@items) { 3121 for my $item (@items) {
2934 last unless --$count; 3122 last unless --$count;
2935 3123
2936 push @widgets, $item->{label} ||= do { 3124 my $label = $item->{label} ||= do {
2937 # TODO: doesn't handle markup well (read as: at all) 3125 # TODO: doesn't handle markup well (read as: at all)
2938 my $short = $item->{count} > 1 3126 my $short = $item->{count} > 1
2939 ? "<b>$item->{count} ×</b> $item->{text}" 3127 ? "<b>$item->{count} ×</b> $item->{text}"
2940 : $item->{text}; 3128 : $item->{text};
2941 3129
… …
2949 tooltip => $item->{tooltip}, 3137 tooltip => $item->{tooltip},
2950 tooltip_font => $::FONT_PROP, 3138 tooltip_font => $::FONT_PROP,
2951 tooltip_width => 0.67, 3139 tooltip_width => 0.67,
2952 fontsize => $item->{fontsize} || $self->{fontsize}, 3140 fontsize => $item->{fontsize} || $self->{fontsize},
2953 max_w => $::WIDTH * 0.44, 3141 max_w => $::WIDTH * 0.44,
2954 fg => $item->{fg}, 3142 fg => [@{ $item->{fg} }],
2955 can_events => 1, 3143 can_events => 1,
2956 can_hover => 1 3144 can_hover => 1
2957 }; 3145 };
3146
3147 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3148 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3149 $label->update;
3150 $label->set_max_size (undef, $label->{req_h} * $diff)
3151 if $diff < 1;
3152 $self->{timer}->interval (1/30);
3153 } else {
3154 $label->{fg}[3] = $item->{fg}[3] || 1;
3155 }
3156
3157 push @widgets, $label;
2958 } 3158 }
2959 3159
2960 $self->clear; 3160 $self->clear;
2961 $self->SUPER::add (reverse @widgets); 3161 $self->SUPER::add (reverse @widgets);
2962} 3162}
… …
2967 $text =~ s/^\s+//; 3167 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//; 3168 $text =~ s/\s+$//;
2969 3169
2970 return unless $text; 3170 return unless $text;
2971 3171
2972 my $timeout = time + ((delete $arg{timeout}) || 60); 3172 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2973 3173
2974 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3174 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2975 3175
2976 if (my $item = $self->{item}{$group}) { 3176 if (my $item = $self->{item}{$group}) {
2977 if ($item->{text} eq $text) { 3177 if ($item->{text} eq $text) {
… …
3007 3207
3008 $self->reorder; 3208 $self->reorder;
3009 $self->SUPER::reconfigure; 3209 $self->SUPER::reconfigure;
3010} 3210}
3011 3211
3212sub DESTROY {
3213 my ($self) = @_;
3214
3215 $self->{timer}->cancel;
3216
3217 $self->SUPER::DESTROY;
3218}
3219
3012############################################################################# 3220#############################################################################
3013 3221
3014package CFClient::UI::Inventory; 3222package CFClient::UI::Inventory;
3015 3223
3016our @ISA = CFClient::UI::ScrolledWindow::; 3224our @ISA = CFClient::UI::ScrolledWindow::;
3017 3225
3018sub new { 3226sub new {
3019 my $class = shift; 3227 my $class = shift;
3020 3228
3021 my $self = $class->SUPER::new ( 3229 my $self = $class->SUPER::new (
3022 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3230 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3023 @_, 3231 @_,
3024 ); 3232 );
3025 3233
3026 $self 3234 $self
3027} 3235}
3028 3236
3029sub set_items { 3237sub set_items {
3030 my ($self, $items) = @_; 3238 my ($self, $items) = @_;
3031 3239
3032 $self->{scrolled}->clear; 3240 $self->{child}->clear;
3033 return unless $items; 3241 return unless $items;
3034 3242
3035 my @items = sort { 3243 my @items = sort {
3036 ($a->{type} <=> $b->{type}) 3244 ($a->{type} <=> $b->{type})
3037 or ($a->{name} cmp $b->{name}) 3245 or ($a->{name} cmp $b->{name})
… …
3041 3249
3042 my $row = 0; 3250 my $row = 0;
3043 for my $item (@items) { 3251 for my $item (@items) {
3044 CFClient::Item::update_widgets $item; 3252 CFClient::Item::update_widgets $item;
3045 3253
3046 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3254 $self->{child}->add (0, $row, $item->{face_widget});
3047 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3255 $self->{child}->add (1, $row, $item->{desc_widget});
3048 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3256 $self->{child}->add (2, $row, $item->{weight_widget});
3049 3257
3050 $row++; 3258 $row++;
3051 } 3259 }
3052} 3260}
3053 3261
… …
3250 3458
3251############################################################################# 3459#############################################################################
3252 3460
3253package CFClient::UI::SpellList; 3461package CFClient::UI::SpellList;
3254 3462
3255our @ISA = CFClient::UI::FancyFrame::; 3463our @ISA = CFClient::UI::Table::;
3256 3464
3257sub new { 3465sub new {
3258 my $class = shift; 3466 my $class = shift;
3259 3467
3260 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3468 my $self = $class->SUPER::new (
3261 3469 binding => [],
3262 $self->add (new CFClient::UI::ScrolledWindow 3470 commands => [],
3263 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3471 @_,
3264 3472 )
3265 $self;
3266} 3473}
3267 3474
3268# XXX: Do sorting? Argl... 3475# XXX: Do sorting? Argl...
3269sub add_spell { 3476sub add_spell {
3270 my ($self, $spell) = @_; 3477 my ($self, $spell) = @_;
3271 $self->{spells}->{$spell->{name}} = $spell; 3478 $self->{spells}->{$spell->{name}} = $spell;
3272 3479
3273 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face 3480 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3274 face => $spell->{face}, 3481 face => $spell->{face},
3275 can_hover => 1, 3482 can_hover => 1,
3276 can_events => 1, 3483 can_events => 1,
3277 tooltip => $spell->{message}); 3484 tooltip => $spell->{message});
3278 3485
3279 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label 3486 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3280 text => $spell->{name}, 3487 text => $spell->{name},
3281 can_hover => 1, 3488 can_hover => 1,
3282 can_events => 1, 3489 can_events => 1,
3283 tooltip => $spell->{message}, 3490 tooltip => $spell->{message},
3284 expand => 1); 3491 expand => 1);
3285 3492
3286 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label 3493 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3287 text => (sprintf "lvl: %2d sp: %2d dmg: %2d", 3494 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3288 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}), 3495 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3289 expand => 1); 3496 expand => 1);
3290 3497
3291 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button 3498 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3292 text => "bind to key", 3499 text => "bind to key",
3293 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }); 3500 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3294} 3501}
3295 3502
3296sub rebuild_spell_list { 3503sub rebuild_spell_list {
… …
3308############################################################################# 3515#############################################################################
3309 3516
3310package CFClient::UI::Root; 3517package CFClient::UI::Root;
3311 3518
3312our @ISA = CFClient::UI::Container::; 3519our @ISA = CFClient::UI::Container::;
3520
3521use List::Util qw(min max);
3313 3522
3314use CFClient::OpenGL; 3523use CFClient::OpenGL;
3315 3524
3316sub new { 3525sub new {
3317 my $class = shift; 3526 my $class = shift;
… …
3452 3661
3453 delete $queue{$widget+0}; 3662 delete $queue{$widget+0};
3454 3663
3455 my ($w, $h) = $widget->size_request; 3664 my ($w, $h) = $widget->size_request;
3456 3665
3457 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3666 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3458 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3667 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3668
3669 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3670 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3459 3671
3460 $w = $widget->{force_w} if exists $widget->{force_w}; 3672 $w = $widget->{force_w} if exists $widget->{force_w};
3461 $h = $widget->{force_h} if exists $widget->{force_h}; 3673 $h = $widget->{force_h} if exists $widget->{force_h};
3462 3674
3463 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3675 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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