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.269 by root, Fri Jun 2 06:22:55 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
… …
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 $self->SUPER::realloc;
1548}
1549
1516sub set_text { 1550sub set_text {
1517 my ($self, $text) = @_; 1551 my ($self, $text) = @_;
1518 1552
1519 return if $self->{text} eq "T$text"; 1553 return if $self->{text} eq "T$text";
1520 $self->{text} = "T$text"; 1554 $self->{text} = "T$text";
1521 1555
1522 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1523 $self->{layout}->set_text ($text); 1557 $self->{layout}->set_text ($text);
1558 delete $self->{req_h};
1524 1559
1525 $self->realloc; 1560 $self->realloc;
1526 $self->update; 1561 $self->update;
1527} 1562}
1528 1563
… …
1534 1569
1535 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1570 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1536 1571
1537 $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;
1538 $self->{layout}->set_markup ($markup); 1573 $self->{layout}->set_markup ($markup);
1574 delete $self->{req_h};
1539 1575
1540 $self->realloc; 1576 $self->realloc;
1541 $self->update; 1577 $self->update;
1542} 1578}
1543 1579
1544sub size_request { 1580sub size_request {
1545 my ($self) = @_; 1581 my ($self) = @_;
1546 1582
1583 if (exists $self->{req_h}) {
1584 @$self{qw(req_w req_h)}
1585 } else {
1547 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1586 $self->{layout}->set_font ($self->{font}) if $self->{font};
1548 $self->{layout}->set_width ($self->{max_w} || -1); 1587 $self->{layout}->set_width ($self->{max_w} || -1);
1549 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1588 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552 1591
1553 my ($w, $h) = $self->{layout}->size; 1592 my ($w, $h) = $self->{layout}->size;
1554 1593
1555 if (exists $self->{template}) { 1594 if (exists $self->{template}) {
1556 $self->{template}->set_font ($self->{font}) if $self->{font}; 1595 $self->{template}->set_font ($self->{font}) if $self->{font};
1557 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1596 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1558 1597
1559 my ($w2, $h2) = $self->{template}->size; 1598 my ($w2, $h2) = $self->{template}->size;
1560 1599
1561 $w = List::Util::max $w, $w2; 1600 $w = List::Util::max $w, $w2;
1562 $h = List::Util::max $h, $h2; 1601 $h = List::Util::max $h, $h2;
1563 } 1602 }
1564 1603
1565 ($w, $h) 1604 ($w, $h)
1605 }
1566} 1606}
1567 1607
1568sub size_allocate { 1608sub size_allocate {
1569 my ($self, $w, $h) = @_; 1609 my ($self, $w, $h) = @_;
1570 1610
… …
1610 }; 1650 };
1611 1651
1612 glEnable GL_TEXTURE_2D; 1652 glEnable GL_TEXTURE_2D;
1613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1614 1654
1655 glColor_premultiply @{$self->{fg}}
1615 if ($tex->{format} == GL_ALPHA) { 1656 if $tex->{format} == GL_ALPHA;
1616 glColor @{$self->{fg}}; 1657
1617 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1618 } else {
1619 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1658 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1620 }
1621 1659
1622 glDisable GL_TEXTURE_2D; 1660 glDisable GL_TEXTURE_2D;
1623} 1661}
1624 1662
1625############################################################################# 1663#############################################################################
… …
1652 1690
1653 delete $self->{cur_h}; 1691 delete $self->{cur_h};
1654 1692
1655 return if $self->{text} eq $text; 1693 return if $self->{text} eq $text;
1656 1694
1657 delete $self->{texture};
1658
1659 $self->{last_activity} = $::NOW; 1695 $self->{last_activity} = $::NOW;
1660 $self->{text} = $text; 1696 $self->{text} = $text;
1661 1697
1662 $text =~ s/./*/g if $self->{hidden}; 1698 $text =~ s/./*/g if $self->{hidden};
1663 $self->{layout}->set_text ("$text "); 1699 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h};
1664 1701
1665 $self->_emit (changed => $self->{text}); 1702 $self->_emit (changed => $self->{text});
1703
1704 $self->realloc;
1705 $self->update;
1666} 1706}
1667 1707
1668sub set_text { 1708sub set_text {
1669 my ($self, $text) = @_; 1709 my ($self, $text) = @_;
1670 1710
1671 $self->{cursor} = length $text; 1711 $self->{cursor} = length $text;
1672 $self->_set_text ($text); 1712 $self->_set_text ($text);
1673
1674 $self->realloc;
1675} 1713}
1676 1714
1677sub get_text { 1715sub get_text {
1678 $_[0]{text} 1716 $_[0]{text}
1679} 1717}
… …
1709 $self->{cursor} = length $text; 1747 $self->{cursor} = length $text;
1710 } elsif ($uni == 27) { 1748 } elsif ($uni == 27) {
1711 $self->_emit ('escape'); 1749 $self->_emit ('escape');
1712 } elsif ($uni) { 1750 } elsif ($uni) {
1713 substr $text, $self->{cursor}++, 0, chr $uni; 1751 substr $text, $self->{cursor}++, 0, chr $uni;
1752 } else {
1753 return 0;
1714 } 1754 }
1715 1755
1716 $self->_set_text ($text); 1756 $self->_set_text ($text);
1717 1757
1718 $self->realloc; 1758 $self->realloc;
1759
1760 1
1719} 1761}
1720 1762
1721sub focus_in { 1763sub focus_in {
1722 my ($self) = @_; 1764 my ($self) = @_;
1723 1765
… …
1738 utf8::encode $text; 1780 utf8::encode $text;
1739 $self->{cursor} = length substr $text, 0, $idx; 1781 $self->{cursor} = length substr $text, 0, $idx;
1740 1782
1741 $self->_set_text ($self->{text}); 1783 $self->_set_text ($self->{text});
1742 $self->update; 1784 $self->update;
1785
1786 1
1743} 1787}
1744 1788
1745sub mouse_motion { 1789sub mouse_motion {
1746 my ($self, $ev, $x, $y) = @_; 1790 my ($self, $ev, $x, $y) = @_;
1747# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1791# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1792
1793 0
1748} 1794}
1749 1795
1750sub _draw { 1796sub _draw {
1751 my ($self) = @_; 1797 my ($self) = @_;
1752 1798
1753 local $self->{fg} = $self->{fg}; 1799 local $self->{fg} = $self->{fg};
1754 1800
1755 if ($FOCUS == $self) { 1801 if ($FOCUS == $self) {
1756 glColor @{$self->{active_bg}}; 1802 glColor_premultiply @{$self->{active_bg}};
1757 $self->{fg} = $self->{active_fg}; 1803 $self->{fg} = $self->{active_fg};
1758 } else { 1804 } else {
1759 glColor @{$self->{bg}}; 1805 glColor_premultiply @{$self->{bg}};
1760 } 1806 }
1761 1807
1762 glEnable GL_BLEND; 1808 glEnable GL_BLEND;
1763 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1809 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1764 glBegin GL_QUADS; 1810 glBegin GL_QUADS;
1765 glVertex 0 , 0; 1811 glVertex 0 , 0;
1766 glVertex 0 , $self->{h}; 1812 glVertex 0 , $self->{h};
1767 glVertex $self->{w}, $self->{h}; 1813 glVertex $self->{w}, $self->{h};
1768 glVertex $self->{w}, 0; 1814 glVertex $self->{w}, 0;
… …
1829 } else { 1875 } else {
1830 $self->set_text ($self->{history_saveback}); 1876 $self->set_text ($self->{history_saveback});
1831 } 1877 }
1832 1878
1833 } else { 1879 } else {
1834 $self->SUPER::key_down ($ev); 1880 return $self->SUPER::key_down ($ev)
1881 }
1882
1835 } 1883 1
1836
1837} 1884}
1838 1885
1839############################################################################# 1886#############################################################################
1840 1887
1841package CFClient::UI::Button; 1888package CFClient::UI::Button;
… …
1870 my ($self, $ev, $x, $y) = @_; 1917 my ($self, $ev, $x, $y) = @_;
1871 1918
1872 $self->emit ("activate") 1919 $self->emit ("activate")
1873 if $x >= 0 && $x < $self->{w} 1920 if $x >= 0 && $x < $self->{w}
1874 && $y >= 0 && $y < $self->{h}; 1921 && $y >= 0 && $y < $self->{h};
1922
1923 1
1875} 1924}
1876 1925
1877sub _draw { 1926sub _draw {
1878 my ($self) = @_; 1927 my ($self) = @_;
1879 1928
1880 local $self->{fg} = $self->{fg}; 1929 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1881
1882 if ($GRAB == $self) {
1883 $self->{fg} = $self->{active_fg};
1884 }
1885 1930
1886 glEnable GL_TEXTURE_2D; 1931 glEnable GL_TEXTURE_2D;
1887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1932 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1888 glColor 0, 0, 0, 1; 1933 glColor 0, 0, 0, 1;
1889 1934
… …
1933 1978
1934 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 1979 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1935 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 1980 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1936 $self->{state} = !$self->{state}; 1981 $self->{state} = !$self->{state};
1937 $self->_emit (changed => $self->{state}); 1982 $self->_emit (changed => $self->{state});
1983 } else {
1984 return 0
1985 }
1986
1938 } 1987 1
1939} 1988}
1940 1989
1941sub _draw { 1990sub _draw {
1942 my ($self) = @_; 1991 my ($self) = @_;
1943 1992
… …
2110 2159
2111 my $h1 = $self->{h} * (1 - $ycut1); 2160 my $h1 = $self->{h} * (1 - $ycut1);
2112 my $h2 = $self->{h} * (1 - $ycut2); 2161 my $h2 = $self->{h} * (1 - $ycut2);
2113 2162
2114 glEnable GL_BLEND; 2163 glEnable GL_BLEND;
2115 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;
2116 glEnable GL_TEXTURE_2D; 2166 glEnable GL_TEXTURE_2D;
2117 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2167 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118 2168
2119 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2169 glBindTexture GL_TEXTURE_2D, $t1->{name};
2120 glBegin GL_QUADS; 2170 glBegin GL_QUADS;
… …
2281 2331
2282 $self->SUPER::button_down ($ev, $x, $y); 2332 $self->SUPER::button_down ($ev, $x, $y);
2283 2333
2284 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2334 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2285 2335
2286 $self->mouse_motion ($ev, $x, $y); 2336 $self->mouse_motion ($ev, $x, $y)
2287} 2337}
2288 2338
2289sub mouse_motion { 2339sub mouse_motion {
2290 my ($self, $ev, $x, $y) = @_; 2340 my ($self, $ev, $x, $y) = @_;
2291 2341
… …
2295 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2345 my (undef, $lo, $hi, $page) = @{$self->{range}};
2296 2346
2297 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2347 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2298 2348
2299 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2349 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2350 } else {
2351 return 0;
2352 }
2353
2300 } 2354 1
2301} 2355}
2302 2356
2303sub update { 2357sub update {
2304 my ($self) = @_; 2358 my ($self) = @_;
2305 2359
2306 $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}) {
2307 $self->set_value ($self->{range}[0]); 2368 $self->set_value ($self->{range}[0]);
2308 2369
2309 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2370 my ($value, $lo, $hi, $page) = @{$self->{range}};
2310 my $range = ($hi - $page - $lo) || 1e-100; 2371 my $range = ($hi - $page - $lo) || 1e-100;
2311 2372
… …
2317 $value = ($value - $lo) / $range; 2378 $value = ($value - $lo) / $range;
2318 $value = $value * $self->{scale} + $self->{offset}; 2379 $value = $value * $self->{scale} + $self->{offset};
2319 2380
2320 $self->{knob_x} = $value - $knob_w * 0.5; 2381 $self->{knob_x} = $value - $knob_w * 0.5;
2321 $self->{knob_w} = $knob_w; 2382 $self->{knob_w} = $knob_w;
2322 }); 2383 }
2323
2324 $self->SUPER::update;
2325}
2326
2327sub _draw {
2328 my ($self) = @_;
2329 2384
2330 $self->SUPER::_draw (); 2385 $self->SUPER::_draw ();
2331 2386
2332 glScale $self->{w}, $self->{h}; 2387 glScale $self->{w}, $self->{h};
2333 2388
… …
2527 2582
2528 delete $self->{texture}; 2583 delete $self->{texture};
2529 } 2584 }
2530 2585
2531 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2586 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2532 glClearColor 0.5, 0.5, 0.5, 0; 2587 glClearColor 0, 0, 0, 0;
2533 glClear GL_COLOR_BUFFER_BIT; 2588 glClear GL_COLOR_BUFFER_BIT;
2534 2589
2535 my $top = int $self->{children}[1]{range}[0]; 2590 my $top = int $self->{children}[1]{range}[0];
2536 2591
2537 my $y0 = $top; 2592 my $y0 = $top;
… …
2572sub _draw { 2627sub _draw {
2573 my ($self) = @_; 2628 my ($self) = @_;
2574 2629
2575 glEnable GL_TEXTURE_2D; 2630 glEnable GL_TEXTURE_2D;
2576 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2631 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2577 glColor 1, 1, 1, 1; 2632 glColor 0, 0, 0, 1;
2578 $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});
2579 glDisable GL_TEXTURE_2D; 2634 glDisable GL_TEXTURE_2D;
2580 2635
2581 $self->{children}[1]->draw; 2636 $self->{children}[1]->draw;
2582 2637
2583} 2638}
… …
2810 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2865 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2811 2866
2812 if ($tex) { 2867 if ($tex) {
2813 glEnable GL_TEXTURE_2D; 2868 glEnable GL_TEXTURE_2D;
2814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2815 glColor 1, 1, 1, 1; 2870 glColor 0, 0, 0, 1;
2816 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2817 glDisable GL_TEXTURE_2D; 2872 glDisable GL_TEXTURE_2D;
2818 } 2873 }
2819} 2874}
2820 2875
… …
2824 $self->{timer}->cancel 2879 $self->{timer}->cancel
2825 if $self->{timer}; 2880 if $self->{timer};
2826 2881
2827 $self->SUPER::DESTROY; 2882 $self->SUPER::DESTROY;
2828} 2883}
2884
2885#############################################################################
2886
2887package CFClient::UI::Buttonbar;
2888
2889our @ISA = CFClient::UI::HBox::;
2890
2891# TODO: should actualyl wrap buttons and other goodies.
2829 2892
2830############################################################################# 2893#############################################################################
2831 2894
2832package CFClient::UI::Menu; 2895package CFClient::UI::Menu;
2833 2896
… …
2883 my ($self, $ev, $x, $y) = @_; 2946 my ($self, $ev, $x, $y) = @_;
2884 2947
2885 # TODO: should use vbox->find_widget or so 2948 # TODO: should use vbox->find_widget or so
2886 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2949 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2887 $self->{hover} = $self->{item}{$HOVER}; 2950 $self->{hover} = $self->{item}{$HOVER};
2951
2952 0
2888} 2953}
2889 2954
2890sub button_up { 2955sub button_up {
2891 my ($self, $ev, $x, $y) = @_; 2956 my ($self, $ev, $x, $y) = @_;
2892 2957
… …
2894 undef $GRAB; 2959 undef $GRAB;
2895 $self->hide; 2960 $self->hide;
2896 2961
2897 $self->_emit ("popdown"); 2962 $self->_emit ("popdown");
2898 $self->{hover}[1]->() if $self->{hover}; 2963 $self->{hover}[1]->() if $self->{hover};
2964 } else {
2965 return 0
2966 }
2967
2899 } 2968 1
2900} 2969}
2901 2970
2902############################################################################# 2971#############################################################################
2903 2972
2904package CFClient::UI::Statusbox; 2973package CFClient::UI::Multiplexer;
2905 2974
2906our @ISA = CFClient::UI::VBox::; 2975our @ISA = CFClient::UI::Container::;
2907 2976
2908sub new { 2977sub new {
2909 my $class = shift; 2978 my $class = shift;
2910 2979
2911 $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 (
2912 fontsize => 0.8, 3089 fontsize => 0.8,
2913 @_, 3090 @_,
2914 ) 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
2915} 3098}
2916 3099
2917sub reorder { 3100sub reorder {
2918 my ($self) = @_; 3101 my ($self) = @_;
2919 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} };
2920 3108
2921 while (my ($k, $v) = each %{ $self->{item} }) { 3109 while (my ($k, $v) = each %{ $self->{item} }) {
2922 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3110 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923 } 3111 }
2924 3112
… …
2927 my @items = sort { 3115 my @items = sort {
2928 $a->{pri} <=> $b->{pri} 3116 $a->{pri} <=> $b->{pri}
2929 or $b->{id} <=> $a->{id} 3117 or $b->{id} <=> $a->{id}
2930 } values %{ $self->{item} }; 3118 } values %{ $self->{item} };
2931 3119
3120 $self->{timer}->interval (1);
3121
2932 my $count = 10 + 1; 3122 my $count = 10 + 1;
2933 for my $item (@items) { 3123 for my $item (@items) {
2934 last unless --$count; 3124 last unless --$count;
2935 3125
2936 push @widgets, $item->{label} ||= do { 3126 my $label = $item->{label} ||= do {
2937 # TODO: doesn't handle markup well (read as: at all) 3127 # TODO: doesn't handle markup well (read as: at all)
2938 my $short = $item->{count} > 1 3128 my $short = $item->{count} > 1
2939 ? "<b>$item->{count} ×</b> $item->{text}" 3129 ? "<b>$item->{count} ×</b> $item->{text}"
2940 : $item->{text}; 3130 : $item->{text};
2941 3131
… …
2949 tooltip => $item->{tooltip}, 3139 tooltip => $item->{tooltip},
2950 tooltip_font => $::FONT_PROP, 3140 tooltip_font => $::FONT_PROP,
2951 tooltip_width => 0.67, 3141 tooltip_width => 0.67,
2952 fontsize => $item->{fontsize} || $self->{fontsize}, 3142 fontsize => $item->{fontsize} || $self->{fontsize},
2953 max_w => $::WIDTH * 0.44, 3143 max_w => $::WIDTH * 0.44,
2954 fg => $item->{fg}, 3144 fg => [@{ $item->{fg} }],
2955 can_events => 1, 3145 can_events => 1,
2956 can_hover => 1 3146 can_hover => 1
2957 }; 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;
2958 } 3160 }
2959 3161
2960 $self->clear; 3162 $self->clear;
2961 $self->SUPER::add (reverse @widgets); 3163 $self->SUPER::add (reverse @widgets);
2962} 3164}
… …
2967 $text =~ s/^\s+//; 3169 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//; 3170 $text =~ s/\s+$//;
2969 3171
2970 return unless $text; 3172 return unless $text;
2971 3173
2972 my $timeout = time + ((delete $arg{timeout}) || 60); 3174 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2973 3175
2974 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3176 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2975 3177
2976 if (my $item = $self->{item}{$group}) { 3178 if (my $item = $self->{item}{$group}) {
2977 if ($item->{text} eq $text) { 3179 if ($item->{text} eq $text) {
… …
3007 3209
3008 $self->reorder; 3210 $self->reorder;
3009 $self->SUPER::reconfigure; 3211 $self->SUPER::reconfigure;
3010} 3212}
3011 3213
3214sub DESTROY {
3215 my ($self) = @_;
3216
3217 $self->{timer}->cancel;
3218
3219 $self->SUPER::DESTROY;
3220}
3221
3012############################################################################# 3222#############################################################################
3013 3223
3014package CFClient::UI::Inventory; 3224package CFClient::UI::Inventory;
3015 3225
3016our @ISA = CFClient::UI::ScrolledWindow::; 3226our @ISA = CFClient::UI::ScrolledWindow::;
3017 3227
3018sub new { 3228sub new {
3019 my $class = shift; 3229 my $class = shift;
3020 3230
3021 my $self = $class->SUPER::new ( 3231 my $self = $class->SUPER::new (
3022 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3232 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3023 @_, 3233 @_,
3024 ); 3234 );
3025 3235
3026 $self 3236 $self
3027} 3237}
3028 3238
3029sub set_items { 3239sub set_items {
3030 my ($self, $items) = @_; 3240 my ($self, $items) = @_;
3031 3241
3032 $self->{scrolled}->clear; 3242 $self->{child}->clear;
3033 return unless $items; 3243 return unless $items;
3034 3244
3035 my @items = sort { 3245 my @items = sort {
3036 ($a->{type} <=> $b->{type}) 3246 ($a->{type} <=> $b->{type})
3037 or ($a->{name} cmp $b->{name}) 3247 or ($a->{name} cmp $b->{name})
… …
3041 3251
3042 my $row = 0; 3252 my $row = 0;
3043 for my $item (@items) { 3253 for my $item (@items) {
3044 CFClient::Item::update_widgets $item; 3254 CFClient::Item::update_widgets $item;
3045 3255
3046 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3256 $self->{child}->add (0, $row, $item->{face_widget});
3047 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3257 $self->{child}->add (1, $row, $item->{desc_widget});
3048 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3258 $self->{child}->add (2, $row, $item->{weight_widget});
3049 3259
3050 $row++; 3260 $row++;
3051 } 3261 }
3052} 3262}
3053 3263
… …
3151 $rec = $::CONN->stop_record if $::CONN; 3361 $rec = $::CONN->stop_record if $::CONN;
3152 return unless ref $rec eq 'ARRAY'; 3362 return unless ref $rec eq 'ARRAY';
3153 $self->set_command_list ($rec); 3363 $self->set_command_list ($rec);
3154} 3364}
3155 3365
3156# if $commit is true, the binding will be set after the user entered a key combo 3366
3367sub ask_for_bind_and_commit {
3368 my ($self) = @_;
3369 $self->ask_for_bind (1);
3370}
3371
3157sub ask_for_bind { 3372sub ask_for_bind {
3158 my ($self, $commit) = @_; 3373 my ($self, $commit) = @_;
3159 3374
3160 CFClient::Binder::open_binding_dialog (sub { 3375 CFClient::Binder::open_binding_dialog (sub {
3161 my ($mod, $sym) = @_; 3376 my ($mod, $sym) = @_;
… …
3245 3460
3246############################################################################# 3461#############################################################################
3247 3462
3248package CFClient::UI::SpellList; 3463package CFClient::UI::SpellList;
3249 3464
3250our @ISA = CFClient::UI::FancyFrame::; 3465our @ISA = CFClient::UI::Table::;
3251 3466
3252sub new { 3467sub new {
3253 my $class = shift; 3468 my $class = shift;
3254 3469
3255 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3470 my $self = $class->SUPER::new (
3256 3471 binding => [],
3257 $self->add (new CFClient::UI::ScrolledWindow 3472 commands => [],
3258 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3473 @_,
3259 3474 )
3260 $self;
3261} 3475}
3262 3476
3263# XXX: Do sorting? Argl... 3477# XXX: Do sorting? Argl...
3264sub add_spell { 3478sub add_spell {
3265 my ($self, $spell) = @_; 3479 my ($self, $spell) = @_;
3266 $self->{spells}->{$spell->{name}} = $spell; 3480 $self->{spells}->{$spell->{name}} = $spell;
3267 3481
3268 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face 3482 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3269 face => $spell->{face}, 3483 face => $spell->{face},
3270 can_hover => 1, 3484 can_hover => 1,
3271 can_events => 1, 3485 can_events => 1,
3272 tooltip => $spell->{message}); 3486 tooltip => $spell->{message});
3273 3487
3274 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label 3488 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3275 text => $spell->{name}, 3489 text => $spell->{name},
3276 can_hover => 1, 3490 can_hover => 1,
3277 can_events => 1, 3491 can_events => 1,
3278 tooltip => $spell->{message}, 3492 tooltip => $spell->{message},
3279 expand => 1); 3493 expand => 1);
3280 3494
3281 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label 3495 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3282 text => (sprintf "lvl: %2d sp: %2d dmg: %2d", 3496 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3283 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}), 3497 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3284 expand => 1); 3498 expand => 1);
3285 3499
3286 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button 3500 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3287 text => "bind to key", 3501 text => "bind to key",
3288 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }); 3502 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3289} 3503}
3290 3504
3291sub rebuild_spell_list { 3505sub rebuild_spell_list {
… …
3303############################################################################# 3517#############################################################################
3304 3518
3305package CFClient::UI::Root; 3519package CFClient::UI::Root;
3306 3520
3307our @ISA = CFClient::UI::Container::; 3521our @ISA = CFClient::UI::Container::;
3522
3523use List::Util qw(min max);
3308 3524
3309use CFClient::OpenGL; 3525use CFClient::OpenGL;
3310 3526
3311sub new { 3527sub new {
3312 my $class = shift; 3528 my $class = shift;
… …
3447 3663
3448 delete $queue{$widget+0}; 3664 delete $queue{$widget+0};
3449 3665
3450 my ($w, $h) = $widget->size_request; 3666 my ($w, $h) = $widget->size_request;
3451 3667
3452 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3668 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3453 $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};
3454 3673
3455 $w = $widget->{force_w} if exists $widget->{force_w}; 3674 $w = $widget->{force_w} if exists $widget->{force_w};
3456 $h = $widget->{force_h} if exists $widget->{force_h}; 3675 $h = $widget->{force_h} if exists $widget->{force_h};
3457 3676
3458 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