… | |
… | |
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 | |
552 | sub 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 | |
564 | sub set_parent { |
559 | sub 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 | |
656 | my $cntx;#d# |
|
|
657 | sub DESTROY { |
651 | sub 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 | |
756 | sub realloc { |
750 | sub 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 | |
780 | sub children { |
777 | sub children { |
781 | @{ $_[0]{children} } |
778 | @{ $_[0]{children} } |
782 | } |
779 | } |
… | |
… | |
793 | } |
790 | } |
794 | |
791 | |
795 | sub clear { |
792 | sub 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; |
… | |
… | |
963 | sub size_request { |
960 | sub 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 | |
974 | sub invoke_size_allocate { |
971 | sub 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 (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 | |
1107 | sub add { |
1113 | sub 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); |
… | |
… | |
1113 | sub update_slider { |
1119 | sub 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 (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 (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 | |
|
|
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); |
1134 | } |
1164 | }; |
1135 | } |
|
|
1136 | |
|
|
1137 | sub update { |
|
|
1138 | my ($self) = @_; |
|
|
1139 | |
|
|
1140 | $self->SUPER::update; |
|
|
1141 | $self->update_slider; |
|
|
1142 | } |
1165 | } |
1143 | |
1166 | |
1144 | sub invoke_mouse_wheel { |
1167 | sub 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 | |
1154 | sub invoke_button_down { |
1176 | sub 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 | |
1587 | package CFPlus::UI::Table; |
1598 | package CFPlus::UI::Table; |
1588 | |
1599 | |
1589 | our @ISA = CFPlus::UI::Base::; |
1600 | our @ISA = CFPlus::UI::Container::; |
1590 | |
1601 | |
1591 | use List::Util qw(max sum); |
1602 | use List::Util qw(max sum); |
1592 | |
1603 | |
1593 | use CFPlus::OpenGL; |
1604 | use CFPlus::OpenGL; |
1594 | |
1605 | |
1595 | sub new { |
1606 | sub 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 | |
1606 | sub children { |
|
|
1607 | grep $_, map @$_, grep $_, @{ $_[0]{children} } |
|
|
1608 | } |
|
|
1609 | |
|
|
1610 | # TODO: store row/col info in child widget and use standard add/del |
|
|
1611 | sub add { |
1616 | sub add { |
|
|
1617 | my ($self, @widgets) = @_; |
|
|
1618 | |
|
|
1619 | for my $child (@widgets) { |
|
|
1620 | $child->{rowspan} ||= 1; |
|
|
1621 | $child->{colspan} ||= 1; |
|
|
1622 | } |
|
|
1623 | |
|
|
1624 | $self->SUPER::add (@widgets); |
|
|
1625 | } |
|
|
1626 | |
|
|
1627 | sub add_at { |
1612 | my ($self) = shift; |
1628 | my $self = shift; |
|
|
1629 | |
|
|
1630 | my @widgets; |
1613 | |
1631 | |
1614 | while (@_) { |
1632 | while (@_) { |
1615 | my ($x, $y, $child) = splice @_, 0, 3, (); |
1633 | my ($col, $row, $child) = splice @_, 0, 3, (); |
1616 | $child->set_parent ($self); |
|
|
1617 | $self->{children}[$y][$x] = $child; |
|
|
1618 | } |
|
|
1619 | |
1634 | |
1620 | $self->{force_realloc} = 1; |
1635 | $child->{row} = $row; |
1621 | $self->{force_size_alloc} = 1; |
1636 | $child->{col} = $col; |
1622 | $self->realloc; |
|
|
1623 | } |
|
|
1624 | |
1637 | |
1625 | sub remove { |
1638 | push @widgets, $child; |
|
|
1639 | } |
|
|
1640 | |
|
|
1641 | $self->add (@widgets); |
|
|
1642 | } |
|
|
1643 | |
|
|
1644 | sub get_wh { |
1626 | my ($self, $child) = @_; |
1645 | my ($self) = @_; |
1627 | |
1646 | |
1628 | for (@{ $self->{children} }) { |
1647 | my (@w, @h); |
1629 | for (@{ $_ || [] }) { |
1648 | |
1630 | $_ = 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]; |
1631 | } |
1659 | } |
1632 | } |
1660 | } |
1633 | } |
|
|
1634 | |
1661 | |
1635 | # TODO: move to container class maybe? send children a signal on removal? |
1662 | # second pass, rows |
1636 | sub clear { |
1663 | for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { |
1637 | my ($self) = @_; |
|
|
1638 | |
|
|
1639 | my @children = $self->children; |
|
|
1640 | delete $self->{children}; |
|
|
1641 | |
|
|
1642 | for (@children) { |
|
|
1643 | delete $_->{parent}; |
|
|
1644 | $_->hide; |
|
|
1645 | } |
|
|
1646 | |
|
|
1647 | $self->realloc; |
|
|
1648 | } |
|
|
1649 | |
|
|
1650 | sub get_wh { |
|
|
1651 | my ($self) = @_; |
|
|
1652 | |
|
|
1653 | my (@w, @h); |
|
|
1654 | |
|
|
1655 | for my $y (0 .. $#{$self->{children}}) { |
|
|
1656 | my $row = $self->{children}[$y] |
|
|
1657 | or next; |
|
|
1658 | |
|
|
1659 | for my $x (0 .. $#$row) { |
|
|
1660 | my $widget = $row->[$x] |
|
|
1661 | or next; |
|
|
1662 | my ($w, $h) = @$widget{qw(req_w req_h)}; |
1664 | my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; |
1663 | |
1665 | |
1664 | $w[$x] = max $w[$x], $w; |
1666 | my $sh = sum @h[$r .. $r + $rs - 1]; |
1665 | $h[$y] = max $h[$y], $h; |
1667 | |
|
|
1668 | if ($h > $sh) { |
|
|
1669 | $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; |
1666 | } |
1670 | } |
1667 | } |
1671 | } |
1668 | |
1672 | |
1669 | (\@w, \@h) |
1673 | (\@w, \@h) |
1670 | } |
1674 | } |
… | |
… | |
1686 | my ($ws, $hs) = $self->get_wh; |
1690 | my ($ws, $hs) = $self->get_wh; |
1687 | |
1691 | |
1688 | my $req_w = (sum @$ws) || 1; |
1692 | my $req_w = (sum @$ws) || 1; |
1689 | my $req_h = (sum @$hs) || 1; |
1693 | my $req_h = (sum @$hs) || 1; |
1690 | |
1694 | |
1691 | # TODO: nicer code |
1695 | # now linearly scale the rows/columns to the allocated size |
1692 | my @col_expand = @{$self->{col_expand}}; |
1696 | my @col_expand = @{$self->{col_expand}}; |
1693 | @col_expand = (1) x @$ws unless @col_expand; |
1697 | @col_expand = (1) x @$ws unless @col_expand; |
1694 | my $col_expand = (sum @col_expand) || 1; |
1698 | my $col_expand = (sum @col_expand) || 1; |
1695 | |
1699 | |
1696 | $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; |
1700 | $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; |
… | |
… | |
1703 | |
1707 | |
1704 | $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; |
1708 | $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; |
1705 | |
1709 | |
1706 | CFPlus::UI::harmonize $hs; |
1710 | CFPlus::UI::harmonize $hs; |
1707 | |
1711 | |
1708 | my $y; |
1712 | my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } |
|
|
1713 | my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } |
1709 | |
1714 | |
1710 | for my $r (0 .. $#{$self->{children}}) { |
1715 | for my $widget ($self->children) { |
1711 | my $row = $self->{children}[$r] |
1716 | my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; |
1712 | or next; |
|
|
1713 | |
1717 | |
1714 | my $x = 0; |
1718 | $widget->configure ( |
1715 | my $row_h = $hs->[$r]; |
1719 | $x[$c], $y[$r], |
|
|
1720 | $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], |
1716 | |
1721 | ); |
1717 | for my $c (0 .. $#$row) { |
|
|
1718 | my $col_w = $ws->[$c]; |
|
|
1719 | |
|
|
1720 | if (my $widget = $row->[$c]) { |
|
|
1721 | $widget->configure ($x, $y, $col_w, $row_h); |
|
|
1722 | } |
|
|
1723 | |
|
|
1724 | $x += $col_w; |
|
|
1725 | } |
|
|
1726 | |
|
|
1727 | $y += $row_h; |
|
|
1728 | } |
1722 | } |
1729 | |
1723 | |
1730 | 1 |
1724 | 1 |
1731 | } |
1725 | } |
1732 | |
1726 | |
1733 | sub find_widget { |
|
|
1734 | my ($self, $x, $y) = @_; |
|
|
1735 | |
|
|
1736 | $x -= $self->{x}; |
|
|
1737 | $y -= $self->{y}; |
|
|
1738 | |
|
|
1739 | my $res; |
|
|
1740 | |
|
|
1741 | for (grep $_, map @$_, grep $_, @{ $self->{children} }) { |
|
|
1742 | $res = $_->find_widget ($x, $y) |
|
|
1743 | and return $res; |
|
|
1744 | } |
|
|
1745 | |
|
|
1746 | $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) |
|
|
1747 | } |
|
|
1748 | |
|
|
1749 | sub _draw { |
|
|
1750 | my ($self) = @_; |
|
|
1751 | |
|
|
1752 | for (grep $_, @{$self->{children}}) { |
|
|
1753 | $_->draw for grep $_, @$_; |
|
|
1754 | } |
|
|
1755 | } |
|
|
1756 | |
|
|
1757 | ############################################################################# |
1727 | ############################################################################# |
1758 | |
1728 | |
1759 | package CFPlus::UI::Fixed; |
1729 | package CFPlus::UI::Fixed; |
1760 | |
1730 | |
1761 | use List::Util qw(min max); |
1731 | use List::Util qw(min max); |
1762 | |
1732 | |
1763 | our @ISA = CFPlus::UI::Container::; |
1733 | our @ISA = CFPlus::UI::Container::; |
1764 | |
1734 | |
1765 | sub add { |
1735 | sub add_fixed { |
1766 | my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_; |
1736 | my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_; |
1767 | |
1737 | |
1768 | $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h]; |
1738 | $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h]; |
1769 | $self->SUPER::add ($child); |
1739 | $self->SUPER::add ($child); |
1770 | } |
1740 | } |
… | |
… | |
1825 | for my $child ($self->visible_children) { |
1795 | for my $child ($self->visible_children) { |
1826 | my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; |
1796 | my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; |
1827 | |
1797 | |
1828 | $x = _scale $pos, $x, $W; |
1798 | $x = _scale $pos, $x, $W; |
1829 | $y = _scale $pos, $x, $H; |
1799 | $y = _scale $pos, $x, $H; |
1830 | $w = _scale $size, $w, $child->{req_w}; |
1800 | $w = _scale $size, $w, $W; |
1831 | $h = _scale $size, $h, $child->{req_h}; |
1801 | $h = _scale $size, $h, $H; |
1832 | |
1802 | |
1833 | $child->configure ($x, $y, $w, $h); |
1803 | $child->configure ($x, $y, $w, $h); |
1834 | } |
1804 | } |
1835 | |
1805 | |
1836 | 1 |
1806 | 1 |
… | |
… | |
3560 | |
3530 | |
3561 | if (my $anim = $::CONN->{anim}[$self->{anim}]) { |
3531 | if (my $anim = $::CONN->{anim}[$self->{anim}]) { |
3562 | if ($anim && @$anim) { |
3532 | if ($anim && @$anim) { |
3563 | delete $self->{wait_face}; |
3533 | delete $self->{wait_face}; |
3564 | $self->{face} = $anim->[ $self->{frame} % @$anim ]; |
3534 | $self->{face} = $anim->[ $self->{frame} % @$anim ]; |
|
|
3535 | $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]; |
3565 | } |
3536 | } |
3566 | } |
3537 | } |
3567 | } |
3538 | } |
3568 | |
3539 | |
3569 | sub size_request { |
3540 | sub size_request { |
3570 | my ($self) = @_; |
3541 | my ($self) = @_; |
3571 | |
3542 | |
3572 | if ($::CONN) { |
3543 | if ($::CONN) { |
3573 | if (my $faceid = $::CONN->{faceid}[$self->{face}]) { |
3544 | if (my $faceid = $::CONN->{faceid}[$self->{face}]) { |
3574 | if (my $tex = $::CONN->{texture}[$faceid]) { |
3545 | if (my $tex = $::CONN->{texture}[$faceid]) { |
|
|
3546 | $self->{tex} = $tex; |
3575 | return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); |
3547 | return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); |
3576 | } else { |
3548 | } else { |
3577 | $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { |
3549 | $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { |
3578 | $self->realloc; |
3550 | $self->realloc; |
3579 | }); |
3551 | }); |
… | |
… | |
3601 | } |
3573 | } |
3602 | |
3574 | |
3603 | sub _draw { |
3575 | sub _draw { |
3604 | my ($self) = @_; |
3576 | my ($self) = @_; |
3605 | |
3577 | |
3606 | return unless $::CONN; |
|
|
3607 | |
|
|
3608 | $self->SUPER::_draw; |
3578 | $self->SUPER::_draw; |
3609 | |
3579 | |
3610 | my $faceid = $::CONN->{faceid}[$self->{face}] |
3580 | if (my $tex = $self->{tex}) { |
3611 | or return; |
|
|
3612 | |
|
|
3613 | my $tex = $::CONN->{texture}[$faceid]; |
|
|
3614 | |
|
|
3615 | if ($tex) { |
|
|
3616 | glEnable GL_TEXTURE_2D; |
3581 | glEnable GL_TEXTURE_2D; |
3617 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
3582 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
3618 | glColor 0, 0, 0, 1; |
3583 | glColor 0, 0, 0, 1; |
3619 | $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
3584 | $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); |
3620 | glDisable GL_TEXTURE_2D; |
3585 | glDisable GL_TEXTURE_2D; |
… | |
… | |
4176 | while ($self->{refresh_hook}) { |
4141 | while ($self->{refresh_hook}) { |
4177 | $_->() |
4142 | $_->() |
4178 | for values %{delete $self->{refresh_hook}}; |
4143 | for values %{delete $self->{refresh_hook}}; |
4179 | } |
4144 | } |
4180 | |
4145 | |
4181 | if ($self->{realloc}) { |
4146 | while ($self->{realloc}) { |
4182 | my %queue; |
4147 | my %queue; |
4183 | my @queue; |
4148 | my @queue; |
4184 | my $widget; |
4149 | my $widget; |
4185 | |
4150 | |
4186 | outer: |
4151 | outer: |
… | |
… | |
4233 | } |
4198 | } |
4234 | } |
4199 | } |
4235 | |
4200 | |
4236 | delete $self->{realloc}{$widget+0}; |
4201 | delete $self->{realloc}{$widget+0}; |
4237 | } |
4202 | } |
4238 | } |
|
|
4239 | |
4203 | |
4240 | while (my $size_alloc = delete $self->{size_alloc}) { |
4204 | while (my $size_alloc = delete $self->{size_alloc}) { |
4241 | my @queue = sort { $b->{visible} <=> $a->{visible} } |
4205 | my @queue = sort { $a->{visible} <=> $b->{visible} } |
4242 | values %$size_alloc; |
4206 | values %$size_alloc; |
4243 | |
4207 | |
4244 | while () { |
4208 | while () { |
4245 | my $widget = pop @queue || last; |
4209 | my $widget = pop @queue || last; |
4246 | |
4210 | |
4247 | my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; |
4211 | my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; |
4248 | |
4212 | |
4249 | $w = 0 if $w < 0; |
|
|
4250 | $h = 0 if $h < 0; |
|
|
4251 | |
|
|
4252 | $w = max $widget->{min_w}, $w; |
4213 | $w = max $widget->{min_w}, $w; |
4253 | $h = max $widget->{min_h}, $h; |
4214 | $h = max $widget->{min_h}, $h; |
4254 | |
4215 | |
4255 | # $w = min $self->{w} - $widget->{x}, $w if $self->{w}; |
4216 | # $w = min $self->{w} - $widget->{x}, $w if $self->{w}; |
4256 | # $h = min $self->{h} - $widget->{y}, $h if $self->{h}; |
4217 | # $h = min $self->{h} - $widget->{y}, $h if $self->{h}; |
4257 | |
4218 | |
4258 | $w = min $widget->{max_w}, $w if exists $widget->{max_w}; |
4219 | $w = min $widget->{max_w}, $w if exists $widget->{max_w}; |
4259 | $h = min $widget->{max_h}, $h if exists $widget->{max_h}; |
4220 | $h = min $widget->{max_h}, $h if exists $widget->{max_h}; |
4260 | |
4221 | |
4261 | $w = int $w + 0.5; |
4222 | $w = int $w + 0.5; |
4262 | $h = int $h + 0.5; |
4223 | $h = int $h + 0.5; |
4263 | |
4224 | |
4264 | 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}) { |
4265 | $widget->{old_w} = $widget->{w}; |
4226 | $widget->{old_w} = $widget->{w}; |
4266 | $widget->{old_h} = $widget->{h}; |
4227 | $widget->{old_h} = $widget->{h}; |
4267 | |
4228 | |
4268 | $widget->{w} = $w; |
4229 | $widget->{w} = $w; |
4269 | $widget->{h} = $h; |
4230 | $widget->{h} = $h; |
4270 | |
4231 | |
4271 | $widget->emit (size_allocate => $w, $h); |
4232 | $widget->emit (size_allocate => $w, $h); |
|
|
4233 | } |
4272 | } |
4234 | } |
4273 | } |
4235 | } |
4274 | } |
4236 | } |
4275 | |
4237 | |
4276 | while ($self->{post_alloc_hook}) { |
4238 | while ($self->{post_alloc_hook}) { |