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.280 by root, Mon Jun 5 01:22:08 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 delete $self->{max_w}; $self->{max_w} = $w if $w;
382 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $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
… …
1610 }; 1637 };
1611 1638
1612 glEnable GL_TEXTURE_2D; 1639 glEnable GL_TEXTURE_2D;
1613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1614 1641
1642 glColor_premultiply @{$self->{fg}}
1615 if ($tex->{format} == GL_ALPHA) { 1643 if $tex->{format} == GL_ALPHA;
1616 glColor @{$self->{fg}}; 1644
1617 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1618 } else {
1619 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1620 }
1621 1646
1622 glDisable GL_TEXTURE_2D; 1647 glDisable GL_TEXTURE_2D;
1623} 1648}
1624 1649
1625############################################################################# 1650#############################################################################
… …
1652 1677
1653 delete $self->{cur_h}; 1678 delete $self->{cur_h};
1654 1679
1655 return if $self->{text} eq $text; 1680 return if $self->{text} eq $text;
1656 1681
1657 delete $self->{texture};
1658
1659 $self->{last_activity} = $::NOW; 1682 $self->{last_activity} = $::NOW;
1660 $self->{text} = $text; 1683 $self->{text} = $text;
1661 1684
1662 $text =~ s/./*/g if $self->{hidden}; 1685 $text =~ s/./*/g if $self->{hidden};
1663 $self->{layout}->set_text ("$text "); 1686 $self->{layout}->set_text ("$text ");
1664 1687
1665 $self->_emit (changed => $self->{text}); 1688 $self->_emit (changed => $self->{text});
1689 $self->update;
1666} 1690}
1667 1691
1668sub set_text { 1692sub set_text {
1669 my ($self, $text) = @_; 1693 my ($self, $text) = @_;
1670 1694
… …
1709 $self->{cursor} = length $text; 1733 $self->{cursor} = length $text;
1710 } elsif ($uni == 27) { 1734 } elsif ($uni == 27) {
1711 $self->_emit ('escape'); 1735 $self->_emit ('escape');
1712 } elsif ($uni) { 1736 } elsif ($uni) {
1713 substr $text, $self->{cursor}++, 0, chr $uni; 1737 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else {
1739 return 0;
1714 } 1740 }
1715 1741
1716 $self->_set_text ($text); 1742 $self->_set_text ($text);
1717 1743
1718 $self->realloc; 1744 $self->realloc;
1745
1746 1
1719} 1747}
1720 1748
1721sub focus_in { 1749sub focus_in {
1722 my ($self) = @_; 1750 my ($self) = @_;
1723 1751
… …
1738 utf8::encode $text; 1766 utf8::encode $text;
1739 $self->{cursor} = length substr $text, 0, $idx; 1767 $self->{cursor} = length substr $text, 0, $idx;
1740 1768
1741 $self->_set_text ($self->{text}); 1769 $self->_set_text ($self->{text});
1742 $self->update; 1770 $self->update;
1771
1772 1
1743} 1773}
1744 1774
1745sub mouse_motion { 1775sub mouse_motion {
1746 my ($self, $ev, $x, $y) = @_; 1776 my ($self, $ev, $x, $y) = @_;
1747# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1777# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778
1779 0
1748} 1780}
1749 1781
1750sub _draw { 1782sub _draw {
1751 my ($self) = @_; 1783 my ($self) = @_;
1752 1784
1753 local $self->{fg} = $self->{fg}; 1785 local $self->{fg} = $self->{fg};
1754 1786
1755 if ($FOCUS == $self) { 1787 if ($FOCUS == $self) {
1756 glColor @{$self->{active_bg}}; 1788 glColor_premultiply @{$self->{active_bg}};
1757 $self->{fg} = $self->{active_fg}; 1789 $self->{fg} = $self->{active_fg};
1758 } else { 1790 } else {
1759 glColor @{$self->{bg}}; 1791 glColor_premultiply @{$self->{bg}};
1760 } 1792 }
1761 1793
1762 glEnable GL_BLEND; 1794 glEnable GL_BLEND;
1763 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1795 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1764 glBegin GL_QUADS; 1796 glBegin GL_QUADS;
1765 glVertex 0 , 0; 1797 glVertex 0 , 0;
1766 glVertex 0 , $self->{h}; 1798 glVertex 0 , $self->{h};
1767 glVertex $self->{w}, $self->{h}; 1799 glVertex $self->{w}, $self->{h};
1768 glVertex $self->{w}, 0; 1800 glVertex $self->{w}, 0;
… …
1829 } else { 1861 } else {
1830 $self->set_text ($self->{history_saveback}); 1862 $self->set_text ($self->{history_saveback});
1831 } 1863 }
1832 1864
1833 } else { 1865 } else {
1834 $self->SUPER::key_down ($ev); 1866 return $self->SUPER::key_down ($ev)
1867 }
1868
1835 } 1869 1
1836
1837} 1870}
1838 1871
1839############################################################################# 1872#############################################################################
1840 1873
1841package CFClient::UI::Button; 1874package CFClient::UI::Button;
… …
1870 my ($self, $ev, $x, $y) = @_; 1903 my ($self, $ev, $x, $y) = @_;
1871 1904
1872 $self->emit ("activate") 1905 $self->emit ("activate")
1873 if $x >= 0 && $x < $self->{w} 1906 if $x >= 0 && $x < $self->{w}
1874 && $y >= 0 && $y < $self->{h}; 1907 && $y >= 0 && $y < $self->{h};
1908
1909 1
1875} 1910}
1876 1911
1877sub _draw { 1912sub _draw {
1878 my ($self) = @_; 1913 my ($self) = @_;
1879 1914
1880 local $self->{fg} = $self->{fg}; 1915 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1881
1882 if ($GRAB == $self) {
1883 $self->{fg} = $self->{active_fg};
1884 }
1885 1916
1886 glEnable GL_TEXTURE_2D; 1917 glEnable GL_TEXTURE_2D;
1887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1888 glColor 0, 0, 0, 1; 1919 glColor 0, 0, 0, 1;
1889 1920
… …
1933 1964
1934 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 1965 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1935 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 1966 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1936 $self->{state} = !$self->{state}; 1967 $self->{state} = !$self->{state};
1937 $self->_emit (changed => $self->{state}); 1968 $self->_emit (changed => $self->{state});
1969 } else {
1970 return 0
1971 }
1972
1938 } 1973 1
1939} 1974}
1940 1975
1941sub _draw { 1976sub _draw {
1942 my ($self) = @_; 1977 my ($self) = @_;
1943 1978
… …
2110 2145
2111 my $h1 = $self->{h} * (1 - $ycut1); 2146 my $h1 = $self->{h} * (1 - $ycut1);
2112 my $h2 = $self->{h} * (1 - $ycut2); 2147 my $h2 = $self->{h} * (1 - $ycut2);
2113 2148
2114 glEnable GL_BLEND; 2149 glEnable GL_BLEND;
2115 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2150 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2151 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2116 glEnable GL_TEXTURE_2D; 2152 glEnable GL_TEXTURE_2D;
2117 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2153 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118 2154
2119 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2155 glBindTexture GL_TEXTURE_2D, $t1->{name};
2120 glBegin GL_QUADS; 2156 glBegin GL_QUADS;
… …
2281 2317
2282 $self->SUPER::button_down ($ev, $x, $y); 2318 $self->SUPER::button_down ($ev, $x, $y);
2283 2319
2284 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2320 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2285 2321
2286 $self->mouse_motion ($ev, $x, $y); 2322 $self->mouse_motion ($ev, $x, $y)
2287} 2323}
2288 2324
2289sub mouse_motion { 2325sub mouse_motion {
2290 my ($self, $ev, $x, $y) = @_; 2326 my ($self, $ev, $x, $y) = @_;
2291 2327
… …
2295 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2331 my (undef, $lo, $hi, $page) = @{$self->{range}};
2296 2332
2297 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2333 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2298 2334
2299 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2335 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2336 } else {
2337 return 0;
2338 }
2339
2300 } 2340 1
2301} 2341}
2302 2342
2303sub update { 2343sub update {
2304 my ($self) = @_; 2344 my ($self) = @_;
2305 2345
2306 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2346 delete $self->{knob_w};
2347 $self->SUPER::update;
2348}
2349
2350sub _draw {
2351 my ($self) = @_;
2352
2353 unless ($self->{knob_w}) {
2307 $self->set_value ($self->{range}[0]); 2354 $self->set_value ($self->{range}[0]);
2308 2355
2309 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2356 my ($value, $lo, $hi, $page) = @{$self->{range}};
2310 my $range = ($hi - $page - $lo) || 1e-100; 2357 my $range = ($hi - $page - $lo) || 1e-100;
2311 2358
… …
2317 $value = ($value - $lo) / $range; 2364 $value = ($value - $lo) / $range;
2318 $value = $value * $self->{scale} + $self->{offset}; 2365 $value = $value * $self->{scale} + $self->{offset};
2319 2366
2320 $self->{knob_x} = $value - $knob_w * 0.5; 2367 $self->{knob_x} = $value - $knob_w * 0.5;
2321 $self->{knob_w} = $knob_w; 2368 $self->{knob_w} = $knob_w;
2322 }); 2369 }
2323
2324 $self->SUPER::update;
2325}
2326
2327sub _draw {
2328 my ($self) = @_;
2329 2370
2330 $self->SUPER::_draw (); 2371 $self->SUPER::_draw ();
2331 2372
2332 glScale $self->{w}, $self->{h}; 2373 glScale $self->{w}, $self->{h};
2333 2374
… …
2527 2568
2528 delete $self->{texture}; 2569 delete $self->{texture};
2529 } 2570 }
2530 2571
2531 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2532 glClearColor 0.5, 0.5, 0.5, 0; 2573 glClearColor 0, 0, 0, 0;
2533 glClear GL_COLOR_BUFFER_BIT; 2574 glClear GL_COLOR_BUFFER_BIT;
2534 2575
2535 my $top = int $self->{children}[1]{range}[0]; 2576 my $top = int $self->{children}[1]{range}[0];
2536 2577
2537 my $y0 = $top; 2578 my $y0 = $top;
… …
2572sub _draw { 2613sub _draw {
2573 my ($self) = @_; 2614 my ($self) = @_;
2574 2615
2575 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2576 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2577 glColor 1, 1, 1, 1; 2618 glColor 0, 0, 0, 1;
2578 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2619 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2579 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2580 2621
2581 $self->{children}[1]->draw; 2622 $self->{children}[1]->draw;
2582 2623
2583} 2624}
… …
2810 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2811 2852
2812 if ($tex) { 2853 if ($tex) {
2813 glEnable GL_TEXTURE_2D; 2854 glEnable GL_TEXTURE_2D;
2814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2815 glColor 1, 1, 1, 1; 2856 glColor 0, 0, 0, 1;
2816 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2817 glDisable GL_TEXTURE_2D; 2858 glDisable GL_TEXTURE_2D;
2818 } 2859 }
2819} 2860}
2820 2861
… …
2824 $self->{timer}->cancel 2865 $self->{timer}->cancel
2825 if $self->{timer}; 2866 if $self->{timer};
2826 2867
2827 $self->SUPER::DESTROY; 2868 $self->SUPER::DESTROY;
2828} 2869}
2870
2871#############################################################################
2872
2873package CFClient::UI::Buttonbar;
2874
2875our @ISA = CFClient::UI::HBox::;
2876
2877# TODO: should actualyl wrap buttons and other goodies.
2829 2878
2830############################################################################# 2879#############################################################################
2831 2880
2832package CFClient::UI::Menu; 2881package CFClient::UI::Menu;
2833 2882
… …
2883 my ($self, $ev, $x, $y) = @_; 2932 my ($self, $ev, $x, $y) = @_;
2884 2933
2885 # TODO: should use vbox->find_widget or so 2934 # TODO: should use vbox->find_widget or so
2886 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2887 $self->{hover} = $self->{item}{$HOVER}; 2936 $self->{hover} = $self->{item}{$HOVER};
2937
2938 0
2888} 2939}
2889 2940
2890sub button_up { 2941sub button_up {
2891 my ($self, $ev, $x, $y) = @_; 2942 my ($self, $ev, $x, $y) = @_;
2892 2943
… …
2894 undef $GRAB; 2945 undef $GRAB;
2895 $self->hide; 2946 $self->hide;
2896 2947
2897 $self->_emit ("popdown"); 2948 $self->_emit ("popdown");
2898 $self->{hover}[1]->() if $self->{hover}; 2949 $self->{hover}[1]->() if $self->{hover};
2950 } else {
2951 return 0
2952 }
2953
2899 } 2954 1
2900} 2955}
2901 2956
2902############################################################################# 2957#############################################################################
2903 2958
2904package CFClient::UI::Statusbox; 2959package CFClient::UI::Multiplexer;
2905 2960
2906our @ISA = CFClient::UI::VBox::; 2961our @ISA = CFClient::UI::Container::;
2907 2962
2908sub new { 2963sub new {
2909 my $class = shift; 2964 my $class = shift;
2910 2965
2911 $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
2967 @_,
2968 );
2969
2970 $self->{current} = $self->{children}[0]
2971 if @{ $self->{children} };
2972
2973 $self
2974}
2975
2976sub add {
2977 my ($self, @widgets) = @_;
2978
2979 $self->SUPER::add (@widgets);
2980
2981 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} };
2983}
2984
2985sub set_current_page {
2986 my ($self, $page_or_widget) = @_;
2987
2988 my $widget = ref $page_or_widget
2989 ? $page_or_widget
2990 : $self->{children}[$page_or_widget];
2991
2992 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994
2995 $self->_emit (page_changed => $self->{current});
2996
2997 $self->realloc;
2998}
2999
3000sub visible_children {
3001 $_[0]{current}
3002}
3003
3004sub size_request {
3005 my ($self) = @_;
3006
3007 $self->{current}->size_request
3008}
3009
3010sub size_allocate {
3011 my ($self, $w, $h) = @_;
3012
3013 $self->{current}->configure (0, 0, $w, $h);
3014}
3015
3016sub _draw {
3017 my ($self) = @_;
3018
3019 $self->{current}->draw;
3020}
3021
3022#############################################################################
3023
3024package CFClient::UI::Notebook;
3025
3026our @ISA = CFClient::UI::VBox::;
3027
3028sub new {
3029 my $class = shift;
3030
3031 my $self = $class->SUPER::new (
3032 buttonbar => (new CFClient::UI::Buttonbar),
3033 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3034 # filter => # will be put between multiplexer and $self
3035 @_,
3036 );
3037
3038 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3039 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3040
3041 $self
3042}
3043
3044sub add {
3045 my ($self, $title, $widget, $tooltip) = @_;
3046
3047 Scalar::Util::weaken $self;
3048
3049 $self->{buttonbar}->add (new CFClient::UI::Button
3050 markup => $title,
3051 tooltip => $tooltip,
3052 on_activate => sub { $self->set_current_page ($widget) },
3053 );
3054
3055 $self->{multiplexer}->add ($widget);
3056}
3057
3058sub set_current_page {
3059 my ($self, $page) = @_;
3060
3061 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current});
3063}
3064
3065#############################################################################
3066
3067package CFClient::UI::Statusbox;
3068
3069our @ISA = CFClient::UI::VBox::;
3070
3071sub new {
3072 my $class = shift;
3073
3074 my $self = $class->SUPER::new (
2912 fontsize => 0.8, 3075 fontsize => 0.8,
2913 @_, 3076 @_,
2914 ) 3077 );
3078
3079 Scalar::Util::weaken (my $this = $self);
3080
3081 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub {
3082 $this->reorder;
3083 $this->update;
3084 });
3085
3086 $self
2915} 3087}
2916 3088
2917sub reorder { 3089sub reorder {
2918 my ($self) = @_; 3090 my ($self) = @_;
2919 my $NOW = time; 3091 my $NOW = Time::HiRes::time;
2920 3092
2921 while (my ($k, $v) = each %{ $self->{item} }) { 3093 while (my ($k, $v) = each %{ $self->{item} }) {
2922 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3094 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923 } 3095 }
2924 3096
… …
2926 3098
2927 my @items = sort { 3099 my @items = sort {
2928 $a->{pri} <=> $b->{pri} 3100 $a->{pri} <=> $b->{pri}
2929 or $b->{id} <=> $a->{id} 3101 or $b->{id} <=> $a->{id}
2930 } values %{ $self->{item} }; 3102 } values %{ $self->{item} };
3103
3104 $self->{timer}->interval (1);
2931 3105
2932 my $count = 10 + 1; 3106 my $count = 10 + 1;
2933 for my $item (@items) { 3107 for my $item (@items) {
2934 last unless --$count; 3108 last unless --$count;
2935 3109
… …
2950 tooltip_font => $::FONT_PROP, 3124 tooltip_font => $::FONT_PROP,
2951 tooltip_width => 0.67, 3125 tooltip_width => 0.67,
2952 fontsize => $item->{fontsize} || $self->{fontsize}, 3126 fontsize => $item->{fontsize} || $self->{fontsize},
2953 max_w => $::WIDTH * 0.44, 3127 max_w => $::WIDTH * 0.44,
2954 fg => $item->{fg}, 3128 fg => $item->{fg},
3129 orig_alpha => $item->{fg}[3] || 1,
2955 can_events => 1, 3130 can_events => 1,
2956 can_hover => 1 3131 can_hover => 1
2957 }; 3132 };
3133
3134 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3135 $item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2;
3136 if ($diff < 1) {
3137 $item->{label}{max_h} = $item->{label}{req_h} * $diff;
3138 $item->{label}->realloc;
3139 }
3140 $item->{label}->update;
3141 $self->{timer}->interval (1/30);
3142 }
2958 } 3143 }
2959 3144
2960 $self->clear; 3145 $self->clear;
2961 $self->SUPER::add (reverse @widgets); 3146 $self->SUPER::add (reverse @widgets);
2962} 3147}
… …
2967 $text =~ s/^\s+//; 3152 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//; 3153 $text =~ s/\s+$//;
2969 3154
2970 return unless $text; 3155 return unless $text;
2971 3156
2972 my $timeout = time + ((delete $arg{timeout}) || 60); 3157 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2973 3158
2974 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3159 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2975 3160
2976 if (my $item = $self->{item}{$group}) { 3161 if (my $item = $self->{item}{$group}) {
2977 if ($item->{text} eq $text) { 3162 if ($item->{text} eq $text) {
… …
3007 3192
3008 $self->reorder; 3193 $self->reorder;
3009 $self->SUPER::reconfigure; 3194 $self->SUPER::reconfigure;
3010} 3195}
3011 3196
3197sub DESTROY {
3198 my ($self) = @_;
3199
3200 $self->{timer}->cancel;
3201
3202 $self->SUPER::DESTROY;
3203}
3204
3012############################################################################# 3205#############################################################################
3013 3206
3014package CFClient::UI::Inventory; 3207package CFClient::UI::Inventory;
3015 3208
3016our @ISA = CFClient::UI::ScrolledWindow::; 3209our @ISA = CFClient::UI::ScrolledWindow::;
3017 3210
3018sub new { 3211sub new {
3019 my $class = shift; 3212 my $class = shift;
3020 3213
3021 my $self = $class->SUPER::new ( 3214 my $self = $class->SUPER::new (
3022 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3215 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3023 @_, 3216 @_,
3024 ); 3217 );
3025 3218
3026 $self 3219 $self
3027} 3220}
3028 3221
3029sub set_items { 3222sub set_items {
3030 my ($self, $items) = @_; 3223 my ($self, $items) = @_;
3031 3224
3032 $self->{scrolled}->clear; 3225 $self->{child}->clear;
3033 return unless $items; 3226 return unless $items;
3034 3227
3035 my @items = sort { 3228 my @items = sort {
3036 ($a->{type} <=> $b->{type}) 3229 ($a->{type} <=> $b->{type})
3037 or ($a->{name} cmp $b->{name}) 3230 or ($a->{name} cmp $b->{name})
… …
3041 3234
3042 my $row = 0; 3235 my $row = 0;
3043 for my $item (@items) { 3236 for my $item (@items) {
3044 CFClient::Item::update_widgets $item; 3237 CFClient::Item::update_widgets $item;
3045 3238
3046 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3239 $self->{child}->add (0, $row, $item->{face_widget});
3047 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3240 $self->{child}->add (1, $row, $item->{desc_widget});
3048 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3241 $self->{child}->add (2, $row, $item->{weight_widget});
3049 3242
3050 $row++; 3243 $row++;
3051 } 3244 }
3052} 3245}
3053 3246
… …
3250 3443
3251############################################################################# 3444#############################################################################
3252 3445
3253package CFClient::UI::SpellList; 3446package CFClient::UI::SpellList;
3254 3447
3255our @ISA = CFClient::UI::FancyFrame::; 3448our @ISA = CFClient::UI::Table::;
3256 3449
3257sub new { 3450sub new {
3258 my $class = shift; 3451 my $class = shift;
3259 3452
3260 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3453 my $self = $class->SUPER::new (
3261 3454 binding => [],
3262 $self->add (new CFClient::UI::ScrolledWindow 3455 commands => [],
3263 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3456 @_,
3264 3457 )
3265 $self;
3266} 3458}
3267 3459
3268# XXX: Do sorting? Argl... 3460# XXX: Do sorting? Argl...
3269sub add_spell { 3461sub add_spell {
3270 my ($self, $spell) = @_; 3462 my ($self, $spell) = @_;
3271 $self->{spells}->{$spell->{name}} = $spell; 3463 $self->{spells}->{$spell->{name}} = $spell;
3272 3464
3273 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face 3465 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3274 face => $spell->{face}, 3466 face => $spell->{face},
3275 can_hover => 1, 3467 can_hover => 1,
3276 can_events => 1, 3468 can_events => 1,
3277 tooltip => $spell->{message}); 3469 tooltip => $spell->{message});
3278 3470
3279 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label 3471 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3280 text => $spell->{name}, 3472 text => $spell->{name},
3281 can_hover => 1, 3473 can_hover => 1,
3282 can_events => 1, 3474 can_events => 1,
3283 tooltip => $spell->{message}, 3475 tooltip => $spell->{message},
3284 expand => 1); 3476 expand => 1);
3285 3477
3286 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label 3478 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3287 text => (sprintf "lvl: %2d sp: %2d dmg: %2d", 3479 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3288 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}), 3480 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3289 expand => 1); 3481 expand => 1);
3290 3482
3291 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button 3483 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3292 text => "bind to key", 3484 text => "bind to key",
3293 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }); 3485 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3294} 3486}
3295 3487
3296sub rebuild_spell_list { 3488sub rebuild_spell_list {
… …
3308############################################################################# 3500#############################################################################
3309 3501
3310package CFClient::UI::Root; 3502package CFClient::UI::Root;
3311 3503
3312our @ISA = CFClient::UI::Container::; 3504our @ISA = CFClient::UI::Container::;
3505
3506use List::Util qw(min max);
3313 3507
3314use CFClient::OpenGL; 3508use CFClient::OpenGL;
3315 3509
3316sub new { 3510sub new {
3317 my $class = shift; 3511 my $class = shift;
… …
3452 3646
3453 delete $queue{$widget+0}; 3647 delete $queue{$widget+0};
3454 3648
3455 my ($w, $h) = $widget->size_request; 3649 my ($w, $h) = $widget->size_request;
3456 3650
3457 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3651 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3458 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3652 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3653
3654 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3655 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3459 3656
3460 $w = $widget->{force_w} if exists $widget->{force_w}; 3657 $w = $widget->{force_w} if exists $widget->{force_w};
3461 $h = $widget->{force_h} if exists $widget->{force_h}; 3658 $h = $widget->{force_h} if exists $widget->{force_h};
3462 3659
3463 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3660 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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