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.385 by root, Fri Jul 20 16:32:17 2007 UTC vs.
Revision 1.403 by root, Sat Jul 21 21:25:23 2007 UTC

… …
113 } 113 }
114 114
115 if ($GRAB) { 115 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 117 # mousewheel
118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9; 118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
120
121 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta;
123
120 $GRAB->emit (mouse_wheel => $ev); 124 $GRAB->emit (mouse_wheel => $ev);
121 } else { 125 } else {
122 $GRAB->emit (button_down => $ev) 126 $GRAB->emit (button_down => $ev)
123 } 127 }
124 } 128 }
… …
547 551
548 # parent 552 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args) 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
550} 554}
551 555
552sub find_widget { 556#sub find_widget {
553 my ($self, $x, $y) = @_; 557# in .xs
554
555 return () unless $self->{can_events};
556
557 return $self
558 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
559 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
560
561 ()
562}
563 558
564sub set_parent { 559sub set_parent {
565 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
566 561
567 CFPlus::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
… …
651 my ($self) = @_; 646 my ($self) = @_;
652 647
653 warn "no draw defined for $self\n"; 648 warn "no draw defined for $self\n";
654} 649}
655 650
656my $cntx;#d#
657sub DESTROY { 651sub DESTROY {
658 my ($self) = @_; 652 my ($self) = @_;
659 653
660 return if CFPlus::in_destruct; 654 return if CFPlus::in_destruct;
661 655
… …
746 can_events => 0, 740 can_events => 0,
747 %arg, 741 %arg,
748 ); 742 );
749 743
750 $self->add (@$children) 744 $self->add (@$children)
751 if $children; 745 if $children && @$children;
752 746
753 $self 747 $self
754} 748}
755 749
756sub realloc { 750sub realloc {
… …
765 my ($self, @widgets) = @_; 759 my ($self, @widgets) = @_;
766 760
767 $_->set_parent ($self) 761 $_->set_parent ($self)
768 for @widgets; 762 for @widgets;
769 763
764 # TODO: only do this in widgets that need it, e.g. root, fixed
770 use sort 'stable'; 765 use sort 'stable';
771 766
772 $self->{children} = [ 767 $self->{children} = [
773 sort { $a->{z} <=> $b->{z} } 768 sort { $a->{z} <=> $b->{z} }
774 @{$self->{children}}, @widgets 769 @{$self->{children}}, @widgets
775 ]; 770 ];
776 771
777 $self->realloc; 772 $self->realloc;
773
774 map $_+0, @widgets
778} 775}
779 776
780sub children { 777sub children {
781 @{ $_[0]{children} } 778 @{ $_[0]{children} }
782} 779}
… …
793} 790}
794 791
795sub clear { 792sub clear {
796 my ($self) = @_; 793 my ($self) = @_;
797 794
798 my $children = delete $self->{children}; 795 my $children = $self->{children};
799 $self->{children} = []; 796 $self->{children} = [];
800 797
801 for (@$children) { 798 for (@$children) {
802 delete $_->{parent}; 799 delete $_->{parent};
803 $_->hide; 800 $_->hide;
… …
963sub size_request { 960sub size_request {
964 my ($self) = @_; 961 my ($self) = @_;
965 962
966 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 963 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
967 964
968 $w = 10 if $self->{scroll_x}; 965 $w = 1 if $self->{scroll_x};
969 $h = 10 if $self->{scroll_y}; 966 $h = 1 if $self->{scroll_y};
970 967
971 ($w, $h) 968 ($w, $h)
972} 969}
973 970
974sub invoke_size_allocate { 971sub invoke_size_allocate {
… …
1020 my ($self, $x, $y) = @_; 1017 my ($self, $x, $y) = @_;
1021 1018
1022 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1019 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1023 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1020 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1024 ) { 1021 ) {
1025 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1022 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1026 } else { 1023 } else {
1027 $self->CFPlus::UI::Base::find_widget ($x, $y) 1024 $self->CFPlus::UI::Base::find_widget ($x, $y)
1028 } 1025 }
1029} 1026}
1030 1027
… …
1051 my $child = delete $arg{child}; 1048 my $child = delete $arg{child};
1052 1049
1053 my $self; 1050 my $self;
1054 1051
1055 my $hslider = new CFPlus::UI::Slider 1052 my $hslider = new CFPlus::UI::Slider
1053 col => 0,
1054 row => 1,
1056 vertical => 0, 1055 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix 1056 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub { 1057 on_changed => sub {
1059 $self->{hpos} = $_[1]; 1058 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1059 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 }, 1060 },
1062 ; 1061 ;
1063 1062
1064 my $vslider = new CFPlus::UI::Slider 1063 my $vslider = new CFPlus::UI::Slider
1064 col => 1,
1065 row => 0,
1065 vertical => 1, 1066 vertical => 1,
1066 range => [0, 0, 1, 0.01], # HACK fix 1067 range => [0, 0, 1, 0.01], # HACK fix
1067 on_changed => sub { 1068 on_changed => sub {
1068 $self->{vpos} = $_[1]; 1069 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1080 row_expand => [1, 0], 1081 row_expand => [1, 0],
1081 %arg, 1082 %arg,
1082 ); 1083 );
1083 1084
1084 $self->{vp} = new CFPlus::UI::ViewPort 1085 $self->{vp} = new CFPlus::UI::ViewPort
1086 col => 0,
1087 row => 0,
1085 expand => 1, 1088 expand => 1,
1086 scroll_x => $self->{scroll_x}, 1089 scroll_x => $self->{scroll_x},
1087 scroll_y => $self->{scroll_y}, 1090 scroll_y => $self->{scroll_y},
1088 on_changed => sub { 1091 on_changed => sub {
1089 my ($vp, $x, $y) = @_; 1092 my ($vp, $x, $y) = @_;
… …
1091 $vp->{parent}{hslider}->set_value ($x); 1094 $vp->{parent}{hslider}->set_value ($x);
1092 $vp->{parent}{vslider}->set_value ($y); 1095 $vp->{parent}{vslider}->set_value ($y);
1093 1096
1094 0 1097 0
1095 }, 1098 },
1099 on_size_allocate => sub {
1100 my ($vp, $w, $h) = @_;
1101 $vp->{parent}->update_slider;
1102 0
1103 },
1096 ; 1104 ;
1097 1105
1098 $self->SUPER::add_at (0, 0, $self->{vp}); 1106 $self->SUPER::add ($self->{vp});
1099 1107
1100 $self->add ($child) if $child; 1108 $self->add ($child) if $child;
1101 1109
1102 $self 1110 $self
1103} 1111}
1104
1105#TODO# update range on size_allocate depending on child
1106 1112
1107sub add { 1113sub add {
1108 my ($self, $widget) = @_; 1114 my ($self, $widget) = @_;
1109 1115
1110 $self->{vp}->add ($self->{child} = $widget); 1116 $self->{vp}->add ($self->{child} = $widget);
… …
1113sub update_slider { 1119sub update_slider {
1114 my ($self) = @_; 1120 my ($self) = @_;
1115 1121
1116 my $child = ($self->{vp} or return)->child; 1122 my $child = ($self->{vp} or return)->child;
1117 1123
1124 if ($self->{scroll_x}) {
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1125 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1126 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120 1127
1121 my $visible = $w1 > $w2; 1128 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) { 1129 if ($visible != $self->{hslider_visible}) {
1130 $self->{hslider_visible} = $visible;
1123 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider}) 1131 $visible ? $self->SUPER::add ($self->{hslider})
1124 : $self->{hslider}->hide; 1132 : $self->SUPER::remove ($self->{hslider});
1133 }
1125 } 1134 }
1126 1135
1136 if ($self->{scroll_y}) {
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1137 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1128 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1138 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129 1139
1130 my $visible = $h1 > $h2; 1140 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) { 1141 if ($visible != $self->{vslider_visible}) {
1142 $self->{vslider_visible} = $visible;
1132 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider}) 1143 $visible ? $self->SUPER::add ($self->{vslider})
1133 : $self->{vslider}->hide; 1144 : $self->SUPER::remove ($self->{vslider});
1145 }
1146 }
1147}
1148
1149sub start_dragging {
1150 my ($self, $ev) = @_;
1151
1152 $self->grab_focus;
1153
1154 my $ox = $self->{vp}{view_x};
1155 my $oy = $self->{vp}{view_y};
1156
1157 $self->{motion} = sub {
1158 my ($ev, $x, $y) = @_;
1159
1160 $ox -= $ev->{xrel};
1161 $oy -= $ev->{yrel};
1162
1163 $self->{vp}->set_offset ($ox, $oy);
1134 } 1164 };
1135}
1136
1137sub update {
1138 my ($self) = @_;
1139
1140 $self->SUPER::update;
1141 $self->update_slider;
1142} 1165}
1143 1166
1144sub invoke_mouse_wheel { 1167sub invoke_mouse_wheel {
1145 my ($self, $ev) = @_; 1168 my ($self, $ev) = @_;
1146 1169
1147 return 0 unless $ev->{dy}; # only vertical movements for now
1148
1149 $self->{vslider}->emit (mouse_wheel => $ev); 1170 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1171 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1150 1172
1151 1 1173 1
1152} 1174}
1153 1175
1154sub invoke_button_down { 1176sub invoke_button_down {
1155 my ($self, $ev, $x, $y) = @_; 1177 my ($self, $ev, $x, $y) = @_;
1156 1178
1157 if ($ev->{button} == 2) { 1179 if ($ev->{button} == 2) {
1158 $self->grab_focus; 1180 $self->start_dragging ($ev);
1159
1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1162
1163 $self->{motion} = sub {
1164 my ($ev, $x, $y) = @_;
1165
1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1167 $self->update;
1168 };
1169
1170 return 1; 1181 return 1;
1171 } 1182 }
1172 1183
1173 0 1184 0
1174} 1185}
… …
1584 1595
1585############################################################################# 1596#############################################################################
1586 1597
1587package CFPlus::UI::Table; 1598package CFPlus::UI::Table;
1588 1599
1589our @ISA = CFPlus::UI::Base::; 1600our @ISA = CFPlus::UI::Container::;
1590 1601
1591use List::Util qw(max sum); 1602use List::Util qw(max sum);
1592 1603
1593use CFPlus::OpenGL; 1604use CFPlus::OpenGL;
1594 1605
1595sub new { 1606sub new {
1596 my $class = shift; 1607 my $class = shift;
1597 1608
1598 $class->SUPER::new ( 1609 $class->SUPER::new (
1599 children => [],
1600 col_expand => [], 1610 col_expand => [],
1601 row_expand => [], 1611 row_expand => [],
1602 @_, 1612 @_,
1603 ) 1613 )
1604} 1614}
1605 1615
1606sub children {
1607 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1608}
1609
1610# TODO: store row/col info in child widget and use standard add/del
1611sub add { 1616sub add {
1612 my $self = shift; 1617 my ($self, @widgets) = @_;
1613 1618
1614 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d# 1619 for my $child (@widgets) {
1615 $self->add_at (@_); 1620 $child->{rowspan} ||= 1;
1621 $child->{colspan} ||= 1;
1622 }
1623
1624 $self->SUPER::add (@widgets);
1616} 1625}
1617 1626
1618sub add_at { 1627sub add_at {
1619 my $self = shift; 1628 my $self = shift;
1620 1629
1630 my @widgets;
1631
1621 while (@_) { 1632 while (@_) {
1622 my ($col, $row, $child) = splice @_, 0, 3, (); 1633 my ($col, $row, $child) = splice @_, 0, 3, ();
1623 1634
1624 $child->set_parent ($self); 1635 $child->{row} = $row;
1625 $self->{children}[$row][$col] = $child; 1636 $child->{col} = $col;
1626 }
1627 1637
1628 $self->{force_realloc} = 1; 1638 push @widgets, $child;
1629 $self->{force_size_alloc} = 1; 1639 }
1630 $self->realloc;
1631}
1632 1640
1633sub remove { 1641 $self->add (@widgets);
1642}
1643
1644sub get_wh {
1634 my ($self, $child) = @_; 1645 my ($self) = @_;
1635 1646
1636 for (@{ $self->{children} }) { 1647 my (@w, @h);
1637 for (@{ $_ || [] }) { 1648
1638 $_ = undef if $_ == $child; 1649 my @children = $self->children;
1650
1651 # first pass, columns
1652 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1653 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1654
1655 my $sw = sum @w[$c .. $c + $cs - 1];
1656
1657 if ($w > $sw) {
1658 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1639 } 1659 }
1640 } 1660 }
1641}
1642 1661
1643# TODO: move to container class maybe? send children a signal on removal? 1662 # second pass, rows
1644sub clear { 1663 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1645 my ($self) = @_;
1646
1647 my @children = $self->children;
1648 delete $self->{children};
1649
1650 for (@children) {
1651 delete $_->{parent};
1652 $_->hide;
1653 }
1654
1655 $self->realloc;
1656}
1657
1658sub get_wh {
1659 my ($self) = @_;
1660
1661 my (@w, @h);
1662
1663 for my $y (0 .. $#{$self->{children}}) {
1664 my $row = $self->{children}[$y]
1665 or next;
1666
1667 for my $x (0 .. $#$row) {
1668 my $widget = $row->[$x]
1669 or next;
1670 my ($w, $h) = @$widget{qw(req_w req_h)}; 1664 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1671 1665
1672 $w[$x] = max $w[$x], $w; 1666 my $sh = sum @h[$r .. $r + $rs - 1];
1673 $h[$y] = max $h[$y], $h; 1667
1668 if ($h > $sh) {
1669 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1674 } 1670 }
1675 } 1671 }
1676 1672
1677 (\@w, \@h) 1673 (\@w, \@h)
1678} 1674}
… …
1694 my ($ws, $hs) = $self->get_wh; 1690 my ($ws, $hs) = $self->get_wh;
1695 1691
1696 my $req_w = (sum @$ws) || 1; 1692 my $req_w = (sum @$ws) || 1;
1697 my $req_h = (sum @$hs) || 1; 1693 my $req_h = (sum @$hs) || 1;
1698 1694
1699 # TODO: nicer code 1695 # now linearly scale the rows/columns to the allocated size
1700 my @col_expand = @{$self->{col_expand}}; 1696 my @col_expand = @{$self->{col_expand}};
1701 @col_expand = (1) x @$ws unless @col_expand; 1697 @col_expand = (1) x @$ws unless @col_expand;
1702 my $col_expand = (sum @col_expand) || 1; 1698 my $col_expand = (sum @col_expand) || 1;
1703 1699
1704 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1700 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1711 1707
1712 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1708 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1713 1709
1714 CFPlus::UI::harmonize $hs; 1710 CFPlus::UI::harmonize $hs;
1715 1711
1716 my $y; 1712 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1713 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1717 1714
1718 for my $r (0 .. $#{$self->{children}}) { 1715 for my $widget ($self->children) {
1719 my $row = $self->{children}[$r] 1716 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1720 or next;
1721 1717
1722 my $x = 0; 1718 $widget->configure (
1723 my $row_h = $hs->[$r]; 1719 $x[$c], $y[$r],
1720 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1724 1721 );
1725 for my $c (0 .. $#$row) {
1726 my $col_w = $ws->[$c];
1727
1728 if (my $widget = $row->[$c]) {
1729 $widget->configure ($x, $y, $col_w, $row_h);
1730 }
1731
1732 $x += $col_w;
1733 }
1734
1735 $y += $row_h;
1736 } 1722 }
1737 1723
1738 1 1724 1
1739} 1725}
1740 1726
1741sub find_widget {
1742 my ($self, $x, $y) = @_;
1743
1744 $x -= $self->{x};
1745 $y -= $self->{y};
1746
1747 my $res;
1748
1749 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1750 $res = $_->find_widget ($x, $y)
1751 and return $res;
1752 }
1753
1754 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1755}
1756
1757sub _draw {
1758 my ($self) = @_;
1759
1760 for (grep $_, @{$self->{children}}) {
1761 $_->draw for grep $_, @$_;
1762 }
1763}
1764
1765############################################################################# 1727#############################################################################
1766 1728
1767package CFPlus::UI::Fixed; 1729package CFPlus::UI::Fixed;
1768 1730
1769use List::Util qw(min max); 1731use List::Util qw(min max);
1770 1732
1771our @ISA = CFPlus::UI::Container::; 1733our @ISA = CFPlus::UI::Container::;
1772 1734
1773sub add { 1735sub add_fixed {
1774 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_; 1736 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1775 1737
1776 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h]; 1738 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1777 $self->SUPER::add ($child); 1739 $self->SUPER::add ($child);
1778} 1740}
… …
1833 for my $child ($self->visible_children) { 1795 for my $child ($self->visible_children) {
1834 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1796 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1835 1797
1836 $x = _scale $pos, $x, $W; 1798 $x = _scale $pos, $x, $W;
1837 $y = _scale $pos, $x, $H; 1799 $y = _scale $pos, $x, $H;
1838 $w = _scale $size, $w, $child->{req_w}; 1800 $w = _scale $size, $w, $W;
1839 $h = _scale $size, $h, $child->{req_h}; 1801 $h = _scale $size, $h, $H;
1840 1802
1841 $child->configure ($x, $y, $w, $h); 1803 $child->configure ($x, $y, $w, $h);
1842 } 1804 }
1843 1805
1844 1 1806 1
… …
3568 3530
3569 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3531 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3570 if ($anim && @$anim) { 3532 if ($anim && @$anim) {
3571 delete $self->{wait_face}; 3533 delete $self->{wait_face};
3572 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3534 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3535 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3573 } 3536 }
3574 } 3537 }
3575} 3538}
3576 3539
3577sub size_request { 3540sub size_request {
3578 my ($self) = @_; 3541 my ($self) = @_;
3579 3542
3580 if ($::CONN) { 3543 if ($::CONN) {
3581 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3544 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3582 if (my $tex = $::CONN->{texture}[$faceid]) { 3545 if (my $tex = $::CONN->{texture}[$faceid]) {
3546 $self->{tex} = $tex;
3583 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3547 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3584 } else { 3548 } else {
3585 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3549 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3586 $self->realloc; 3550 $self->realloc;
3587 }); 3551 });
… …
3609} 3573}
3610 3574
3611sub _draw { 3575sub _draw {
3612 my ($self) = @_; 3576 my ($self) = @_;
3613 3577
3614 return unless $::CONN;
3615
3616 $self->SUPER::_draw; 3578 $self->SUPER::_draw;
3617 3579
3618 my $faceid = $::CONN->{faceid}[$self->{face}] 3580 if (my $tex = $self->{tex}) {
3619 or return;
3620
3621 my $tex = $::CONN->{texture}[$faceid];
3622
3623 if ($tex) {
3624 glEnable GL_TEXTURE_2D; 3581 glEnable GL_TEXTURE_2D;
3625 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3582 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3626 glColor 0, 0, 0, 1; 3583 glColor 0, 0, 0, 1;
3627 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3584 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3628 glDisable GL_TEXTURE_2D; 3585 glDisable GL_TEXTURE_2D;
… …
4184 while ($self->{refresh_hook}) { 4141 while ($self->{refresh_hook}) {
4185 $_->() 4142 $_->()
4186 for values %{delete $self->{refresh_hook}}; 4143 for values %{delete $self->{refresh_hook}};
4187 } 4144 }
4188 4145
4189 if ($self->{realloc}) { 4146 while ($self->{realloc}) {
4190 my %queue; 4147 my %queue;
4191 my @queue; 4148 my @queue;
4192 my $widget; 4149 my $widget;
4193 4150
4194 outer: 4151 outer:
… …
4241 } 4198 }
4242 } 4199 }
4243 4200
4244 delete $self->{realloc}{$widget+0}; 4201 delete $self->{realloc}{$widget+0};
4245 } 4202 }
4246 }
4247 4203
4248 while (my $size_alloc = delete $self->{size_alloc}) { 4204 while (my $size_alloc = delete $self->{size_alloc}) {
4249 my @queue = sort { $b->{visible} <=> $a->{visible} } 4205 my @queue = sort { $a->{visible} <=> $b->{visible} }
4250 values %$size_alloc; 4206 values %$size_alloc;
4251 4207
4252 while () { 4208 while () {
4253 my $widget = pop @queue || last; 4209 my $widget = pop @queue || last;
4254 4210
4255 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4211 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4256 4212
4257 $w = 0 if $w < 0;
4258 $h = 0 if $h < 0;
4259
4260 $w = max $widget->{min_w}, $w; 4213 $w = max $widget->{min_w}, $w;
4261 $h = max $widget->{min_h}, $h; 4214 $h = max $widget->{min_h}, $h;
4262 4215
4263# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4216# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4264# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4217# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4265 4218
4266 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4219 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4267 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4220 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4268 4221
4269 $w = int $w + 0.5; 4222 $w = int $w + 0.5;
4270 $h = int $h + 0.5; 4223 $h = int $h + 0.5;
4271 4224
4272 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4225 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4273 $widget->{old_w} = $widget->{w}; 4226 $widget->{old_w} = $widget->{w};
4274 $widget->{old_h} = $widget->{h}; 4227 $widget->{old_h} = $widget->{h};
4275 4228
4276 $widget->{w} = $w; 4229 $widget->{w} = $w;
4277 $widget->{h} = $h; 4230 $widget->{h} = $h;
4278 4231
4279 $widget->emit (size_allocate => $w, $h); 4232 $widget->emit (size_allocate => $w, $h);
4233 }
4280 } 4234 }
4281 } 4235 }
4282 } 4236 }
4283 4237
4284 while ($self->{post_alloc_hook}) { 4238 while ($self->{post_alloc_hook}) {

Diff Legend

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