… | |
… | |
646 | my ($self) = @_; |
646 | my ($self) = @_; |
647 | |
647 | |
648 | warn "no draw defined for $self\n"; |
648 | warn "no draw defined for $self\n"; |
649 | } |
649 | } |
650 | |
650 | |
651 | my $cntx;#d# |
|
|
652 | sub DESTROY { |
651 | sub DESTROY { |
653 | my ($self) = @_; |
652 | my ($self) = @_; |
654 | |
653 | |
655 | return if CFPlus::in_destruct; |
654 | return if CFPlus::in_destruct; |
656 | |
655 | |
… | |
… | |
769 | sort { $a->{z} <=> $b->{z} } |
768 | sort { $a->{z} <=> $b->{z} } |
770 | @{$self->{children}}, @widgets |
769 | @{$self->{children}}, @widgets |
771 | ]; |
770 | ]; |
772 | |
771 | |
773 | $self->realloc; |
772 | $self->realloc; |
|
|
773 | |
|
|
774 | map $_+0, @widgets |
774 | } |
775 | } |
775 | |
776 | |
776 | sub children { |
777 | sub children { |
777 | @{ $_[0]{children} } |
778 | @{ $_[0]{children} } |
778 | } |
779 | } |
… | |
… | |
789 | } |
790 | } |
790 | |
791 | |
791 | sub clear { |
792 | sub clear { |
792 | my ($self) = @_; |
793 | my ($self) = @_; |
793 | |
794 | |
794 | my $children = delete $self->{children}; |
795 | my $children = $self->{children}; |
795 | $self->{children} = []; |
796 | $self->{children} = []; |
796 | |
797 | |
797 | for (@$children) { |
798 | for (@$children) { |
798 | delete $_->{parent}; |
799 | delete $_->{parent}; |
799 | $_->hide; |
800 | $_->hide; |
… | |
… | |
1093 | $vp->{parent}{hslider}->set_value ($x); |
1094 | $vp->{parent}{hslider}->set_value ($x); |
1094 | $vp->{parent}{vslider}->set_value ($y); |
1095 | $vp->{parent}{vslider}->set_value ($y); |
1095 | |
1096 | |
1096 | 0 |
1097 | 0 |
1097 | }, |
1098 | }, |
|
|
1099 | on_size_allocate => sub { |
|
|
1100 | my ($vp, $w, $h) = @_; |
|
|
1101 | $vp->{parent}->update_slider; |
|
|
1102 | 0 |
|
|
1103 | }, |
1098 | ; |
1104 | ; |
1099 | |
1105 | |
1100 | $self->SUPER::add ($self->{vp}); |
1106 | $self->SUPER::add ($self->{vp}); |
1101 | |
1107 | |
1102 | $self->add ($child) if $child; |
1108 | $self->add ($child) if $child; |
1103 | |
1109 | |
1104 | $self |
1110 | $self |
1105 | } |
1111 | } |
1106 | |
|
|
1107 | #TODO# update range on size_allocate depending on child? |
|
|
1108 | |
1112 | |
1109 | sub add { |
1113 | sub add { |
1110 | my ($self, $widget) = @_; |
1114 | my ($self, $widget) = @_; |
1111 | |
1115 | |
1112 | $self->{vp}->add ($self->{child} = $widget); |
1116 | $self->{vp}->add ($self->{child} = $widget); |
… | |
… | |
1115 | sub update_slider { |
1119 | sub update_slider { |
1116 | my ($self) = @_; |
1120 | my ($self) = @_; |
1117 | |
1121 | |
1118 | my $child = ($self->{vp} or return)->child; |
1122 | my $child = ($self->{vp} or return)->child; |
1119 | |
1123 | |
|
|
1124 | if ($self->{scroll_x}) { |
1120 | my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); |
1125 | my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w}); |
1121 | $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]); |
1122 | |
1127 | |
1123 | my $visible = $w1 > $w2; |
1128 | my $visible = $w1 > $w2; |
1124 | if ($visible != $self->{hslider}{visible}) { |
1129 | if ($visible != $self->{hslider_visible}) { |
|
|
1130 | $self->{hslider_visible} = $visible; |
1125 | $visible ? $self->SUPER::add ($self->{hslider}) |
1131 | $visible ? $self->SUPER::add ($self->{hslider}) |
1126 | : $self->SUPER::remove ($self->{hslider}); |
1132 | : $self->SUPER::remove ($self->{hslider}); |
|
|
1133 | } |
1127 | } |
1134 | } |
1128 | |
1135 | |
|
|
1136 | if ($self->{scroll_y}) { |
1129 | my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); |
1137 | my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h}); |
1130 | $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]); |
1131 | |
1139 | |
1132 | my $visible = $h1 > $h2; |
1140 | my $visible = $h1 > $h2; |
1133 | if ($visible != $self->{vslider}{visible}) { |
1141 | if ($visible != $self->{vslider_visible}) { |
|
|
1142 | $self->{vslider_visible} = $visible; |
1134 | $visible ? $self->SUPER::add ($self->{vslider}) |
1143 | $visible ? $self->SUPER::add ($self->{vslider}) |
1135 | : $self->SUPER::remove ($self->{vslider}); |
1144 | : $self->SUPER::remove ($self->{vslider}); |
|
|
1145 | } |
|
|
1146 | } |
|
|
1147 | } |
|
|
1148 | |
|
|
1149 | sub 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); |
1136 | } |
1164 | }; |
1137 | } |
|
|
1138 | |
|
|
1139 | sub update { |
|
|
1140 | my ($self) = @_; |
|
|
1141 | |
|
|
1142 | $self->update_slider; |
|
|
1143 | $self->SUPER::update; |
|
|
1144 | } |
1165 | } |
1145 | |
1166 | |
1146 | sub invoke_mouse_wheel { |
1167 | sub invoke_mouse_wheel { |
1147 | my ($self, $ev) = @_; |
1168 | my ($self, $ev) = @_; |
1148 | |
1169 | |
1149 | $self->{vslider}->emit (mouse_wheel => $ev) |
1170 | $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible}; |
1150 | if $ev->{dy}; |
|
|
1151 | |
|
|
1152 | $self->{hslider}->emit (mouse_wheel => $ev) |
1171 | $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible}; |
1153 | if $ev->{dx}; |
|
|
1154 | |
1172 | |
1155 | 1 |
1173 | 1 |
1156 | } |
1174 | } |
1157 | |
1175 | |
1158 | sub invoke_button_down { |
1176 | sub invoke_button_down { |
1159 | my ($self, $ev, $x, $y) = @_; |
1177 | my ($self, $ev, $x, $y) = @_; |
1160 | |
1178 | |
1161 | if ($ev->{button} == 2) { |
1179 | if ($ev->{button} == 2) { |
1162 | $self->grab_focus; |
1180 | $self->start_dragging ($ev); |
1163 | |
|
|
1164 | my $ox = $self->{vp}{view_x} + $ev->{x}; |
|
|
1165 | my $oy = $self->{vp}{view_y} + $ev->{y}; |
|
|
1166 | |
|
|
1167 | $self->{motion} = sub { |
|
|
1168 | my ($ev, $x, $y) = @_; |
|
|
1169 | |
|
|
1170 | $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y}); |
|
|
1171 | $self->update; |
|
|
1172 | }; |
|
|
1173 | |
|
|
1174 | return 1; |
1181 | return 1; |
1175 | } |
1182 | } |
1176 | |
1183 | |
1177 | 0 |
1184 | 0 |
1178 | } |
1185 | } |
… | |
… | |
1639 | |
1646 | |
1640 | my (@w, @h); |
1647 | my (@w, @h); |
1641 | |
1648 | |
1642 | my @children = $self->children; |
1649 | my @children = $self->children; |
1643 | |
1650 | |
|
|
1651 | # first pass, columns |
1644 | for my $widget (sort { $b->{rowspan} * $b->{colspan} <=> $a->{rowspan} * $a->{colspan} } @children) { |
1652 | for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { |
1645 | my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; |
1653 | my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; |
1646 | |
1654 | |
1647 | my $sw = sum @w[$c .. $c + $cs - 1]; |
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]; |
|
|
1659 | } |
|
|
1660 | } |
|
|
1661 | |
|
|
1662 | # second pass, rows |
|
|
1663 | for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { |
|
|
1664 | my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; |
|
|
1665 | |
1648 | my $sh = sum @h[$r .. $r + $rs - 1]; |
1666 | my $sh = sum @h[$r .. $r + $rs - 1]; |
1649 | |
1667 | |
1650 | if ($w > $sw) { |
|
|
1651 | $_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1]; |
|
|
1652 | } |
|
|
1653 | |
|
|
1654 | if ($h > $sh) { |
1668 | if ($h > $sh) { |
1655 | $_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1]; |
1669 | $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; |
1656 | } |
1670 | } |
1657 | } |
1671 | } |
1658 | |
1672 | |
1659 | (\@w, \@h) |
1673 | (\@w, \@h) |
1660 | } |
1674 | } |
… | |
… | |
1716 | |
1730 | |
1717 | use List::Util qw(min max); |
1731 | use List::Util qw(min max); |
1718 | |
1732 | |
1719 | our @ISA = CFPlus::UI::Container::; |
1733 | our @ISA = CFPlus::UI::Container::; |
1720 | |
1734 | |
1721 | sub add { |
1735 | sub add_fixed { |
1722 | my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_; |
1736 | my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_; |
1723 | |
1737 | |
1724 | $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h]; |
1738 | $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h]; |
1725 | $self->SUPER::add ($child); |
1739 | $self->SUPER::add ($child); |
1726 | } |
1740 | } |
… | |
… | |
1781 | for my $child ($self->visible_children) { |
1795 | for my $child ($self->visible_children) { |
1782 | my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; |
1796 | my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; |
1783 | |
1797 | |
1784 | $x = _scale $pos, $x, $W; |
1798 | $x = _scale $pos, $x, $W; |
1785 | $y = _scale $pos, $x, $H; |
1799 | $y = _scale $pos, $x, $H; |
1786 | $w = _scale $size, $w, $child->{req_w}; |
1800 | $w = _scale $size, $w, $W; |
1787 | $h = _scale $size, $h, $child->{req_h}; |
1801 | $h = _scale $size, $h, $H; |
1788 | |
1802 | |
1789 | $child->configure ($x, $y, $w, $h); |
1803 | $child->configure ($x, $y, $w, $h); |
1790 | } |
1804 | } |
1791 | |
1805 | |
1792 | 1 |
1806 | 1 |
… | |
… | |
3516 | |
3530 | |
3517 | if (my $anim = $::CONN->{anim}[$self->{anim}]) { |
3531 | if (my $anim = $::CONN->{anim}[$self->{anim}]) { |
3518 | if ($anim && @$anim) { |
3532 | if ($anim && @$anim) { |
3519 | delete $self->{wait_face}; |
3533 | delete $self->{wait_face}; |
3520 | $self->{face} = $anim->[ $self->{frame} % @$anim ]; |
3534 | $self->{face} = $anim->[ $self->{frame} % @$anim ]; |
|
|
3535 | $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]; |
3521 | } |
3536 | } |
3522 | } |
3537 | } |
3523 | } |
3538 | } |
3524 | |
3539 | |
3525 | sub size_request { |
3540 | sub size_request { |
3526 | my ($self) = @_; |
3541 | my ($self) = @_; |
3527 | |
3542 | |
3528 | if ($::CONN) { |
3543 | if ($::CONN) { |
3529 | if (my $faceid = $::CONN->{faceid}[$self->{face}]) { |
3544 | if (my $faceid = $::CONN->{faceid}[$self->{face}]) { |
3530 | if (my $tex = $::CONN->{texture}[$faceid]) { |
3545 | if (my $tex = $::CONN->{texture}[$faceid]) { |
|
|
3546 | $self->{tex} = $tex; |
3531 | return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); |
3547 | return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); |
3532 | } else { |
3548 | } else { |
3533 | $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { |
3549 | $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { |
3534 | $self->realloc; |
3550 | $self->realloc; |
3535 | }); |
3551 | }); |
… | |
… | |
3557 | } |
3573 | } |
3558 | |
3574 | |
3559 | sub _draw { |
3575 | sub _draw { |
3560 | my ($self) = @_; |
3576 | my ($self) = @_; |
3561 | |
3577 | |
3562 | return unless $::CONN; |
|
|
3563 | |
|
|
3564 | $self->SUPER::_draw; |
3578 | $self->SUPER::_draw; |
3565 | |
3579 | |
3566 | my $faceid = $::CONN->{faceid}[$self->{face}] |
3580 | if (my $tex = $self->{tex}) { |
3567 | or return; |
|
|
3568 | |
|
|
3569 | my $tex = $::CONN->{texture}[$faceid]; |
|
|
3570 | |
|
|
3571 | if ($tex) { |
|
|
3572 | glEnable GL_TEXTURE_2D; |
3581 | glEnable GL_TEXTURE_2D; |
3573 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
3582 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
3574 | glColor 0, 0, 0, 1; |
3583 | glColor 0, 0, 0, 1; |
3575 | $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
3584 | $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
3576 | glDisable GL_TEXTURE_2D; |
3585 | glDisable GL_TEXTURE_2D; |
… | |
… | |
4132 | while ($self->{refresh_hook}) { |
4141 | while ($self->{refresh_hook}) { |
4133 | $_->() |
4142 | $_->() |
4134 | for values %{delete $self->{refresh_hook}}; |
4143 | for values %{delete $self->{refresh_hook}}; |
4135 | } |
4144 | } |
4136 | |
4145 | |
4137 | if ($self->{realloc}) { |
4146 | while ($self->{realloc}) { |
4138 | my %queue; |
4147 | my %queue; |
4139 | my @queue; |
4148 | my @queue; |
4140 | my $widget; |
4149 | my $widget; |
4141 | |
4150 | |
4142 | outer: |
4151 | outer: |
… | |
… | |
4189 | } |
4198 | } |
4190 | } |
4199 | } |
4191 | |
4200 | |
4192 | delete $self->{realloc}{$widget+0}; |
4201 | delete $self->{realloc}{$widget+0}; |
4193 | } |
4202 | } |
4194 | } |
|
|
4195 | |
4203 | |
4196 | while (my $size_alloc = delete $self->{size_alloc}) { |
4204 | while (my $size_alloc = delete $self->{size_alloc}) { |
4197 | my @queue = sort { $b->{visible} <=> $a->{visible} } |
4205 | my @queue = sort { $a->{visible} <=> $b->{visible} } |
4198 | values %$size_alloc; |
4206 | values %$size_alloc; |
4199 | |
4207 | |
4200 | while () { |
4208 | while () { |
4201 | my $widget = pop @queue || last; |
4209 | my $widget = pop @queue || last; |
4202 | |
4210 | |
4203 | my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; |
4211 | my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; |
4204 | |
4212 | |
4205 | $w = 0 if $w < 0; |
|
|
4206 | $h = 0 if $h < 0; |
|
|
4207 | |
|
|
4208 | $w = max $widget->{min_w}, $w; |
4213 | $w = max $widget->{min_w}, $w; |
4209 | $h = max $widget->{min_h}, $h; |
4214 | $h = max $widget->{min_h}, $h; |
4210 | |
4215 | |
4211 | # $w = min $self->{w} - $widget->{x}, $w if $self->{w}; |
4216 | # $w = min $self->{w} - $widget->{x}, $w if $self->{w}; |
4212 | # $h = min $self->{h} - $widget->{y}, $h if $self->{h}; |
4217 | # $h = min $self->{h} - $widget->{y}, $h if $self->{h}; |
4213 | |
4218 | |
4214 | $w = min $widget->{max_w}, $w if exists $widget->{max_w}; |
4219 | $w = min $widget->{max_w}, $w if exists $widget->{max_w}; |
4215 | $h = min $widget->{max_h}, $h if exists $widget->{max_h}; |
4220 | $h = min $widget->{max_h}, $h if exists $widget->{max_h}; |
4216 | |
4221 | |
4217 | $w = int $w + 0.5; |
4222 | $w = int $w + 0.5; |
4218 | $h = int $h + 0.5; |
4223 | $h = int $h + 0.5; |
4219 | |
4224 | |
4220 | 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}) { |
4221 | $widget->{old_w} = $widget->{w}; |
4226 | $widget->{old_w} = $widget->{w}; |
4222 | $widget->{old_h} = $widget->{h}; |
4227 | $widget->{old_h} = $widget->{h}; |
4223 | |
4228 | |
4224 | $widget->{w} = $w; |
4229 | $widget->{w} = $w; |
4225 | $widget->{h} = $h; |
4230 | $widget->{h} = $h; |
4226 | |
4231 | |
4227 | $widget->emit (size_allocate => $w, $h); |
4232 | $widget->emit (size_allocate => $w, $h); |
|
|
4233 | } |
4228 | } |
4234 | } |
4229 | } |
4235 | } |
4230 | } |
4236 | } |
4231 | |
4237 | |
4232 | while ($self->{post_alloc_hook}) { |
4238 | while ($self->{post_alloc_hook}) { |