| … | |
… | |
| 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 | |
| … | |
… | |
| 741 | can_events => 0, |
740 | can_events => 0, |
| 742 | %arg, |
741 | %arg, |
| 743 | ); |
742 | ); |
| 744 | |
743 | |
| 745 | $self->add (@$children) |
744 | $self->add (@$children) |
| 746 | if $children; |
745 | if $children && @$children; |
| 747 | |
746 | |
| 748 | $self |
747 | $self |
| 749 | } |
748 | } |
| 750 | |
749 | |
| 751 | sub realloc { |
750 | sub realloc { |
| … | |
… | |
| 760 | my ($self, @widgets) = @_; |
759 | my ($self, @widgets) = @_; |
| 761 | |
760 | |
| 762 | $_->set_parent ($self) |
761 | $_->set_parent ($self) |
| 763 | for @widgets; |
762 | for @widgets; |
| 764 | |
763 | |
|
|
764 | # TODO: only do this in widgets that need it, e.g. root, fixed |
| 765 | use sort 'stable'; |
765 | use sort 'stable'; |
| 766 | |
766 | |
| 767 | $self->{children} = [ |
767 | $self->{children} = [ |
| 768 | sort { $a->{z} <=> $b->{z} } |
768 | sort { $a->{z} <=> $b->{z} } |
| 769 | @{$self->{children}}, @widgets |
769 | @{$self->{children}}, @widgets |
| 770 | ]; |
770 | ]; |
| 771 | |
771 | |
| 772 | $self->realloc; |
772 | $self->realloc; |
|
|
773 | |
|
|
774 | map $_+0, @widgets |
| 773 | } |
775 | } |
| 774 | |
776 | |
| 775 | sub children { |
777 | sub children { |
| 776 | @{ $_[0]{children} } |
778 | @{ $_[0]{children} } |
| 777 | } |
779 | } |
| … | |
… | |
| 788 | } |
790 | } |
| 789 | |
791 | |
| 790 | sub clear { |
792 | sub clear { |
| 791 | my ($self) = @_; |
793 | my ($self) = @_; |
| 792 | |
794 | |
| 793 | my $children = delete $self->{children}; |
795 | my $children = $self->{children}; |
| 794 | $self->{children} = []; |
796 | $self->{children} = []; |
| 795 | |
797 | |
| 796 | for (@$children) { |
798 | for (@$children) { |
| 797 | delete $_->{parent}; |
799 | delete $_->{parent}; |
| 798 | $_->hide; |
800 | $_->hide; |
| … | |
… | |
| 958 | sub size_request { |
960 | sub size_request { |
| 959 | my ($self) = @_; |
961 | my ($self) = @_; |
| 960 | |
962 | |
| 961 | my ($w, $h) = @{$self->child}{qw(req_w req_h)}; |
963 | my ($w, $h) = @{$self->child}{qw(req_w req_h)}; |
| 962 | |
964 | |
| 963 | $w = 10 if $self->{scroll_x}; |
965 | $w = 1 if $self->{scroll_x}; |
| 964 | $h = 10 if $self->{scroll_y}; |
966 | $h = 1 if $self->{scroll_y}; |
| 965 | |
967 | |
| 966 | ($w, $h) |
968 | ($w, $h) |
| 967 | } |
969 | } |
| 968 | |
970 | |
| 969 | sub invoke_size_allocate { |
971 | sub invoke_size_allocate { |
| … | |
… | |
| 1046 | my $child = delete $arg{child}; |
1048 | my $child = delete $arg{child}; |
| 1047 | |
1049 | |
| 1048 | my $self; |
1050 | my $self; |
| 1049 | |
1051 | |
| 1050 | my $hslider = new CFPlus::UI::Slider |
1052 | my $hslider = new CFPlus::UI::Slider |
|
|
1053 | col => 0, |
|
|
1054 | row => 1, |
| 1051 | vertical => 0, |
1055 | vertical => 0, |
| 1052 | range => [0, 0, 1, 0.01], # HACK fix |
1056 | range => [0, 0, 1, 0.01], # HACK fix |
| 1053 | on_changed => sub { |
1057 | on_changed => sub { |
| 1054 | $self->{hpos} = $_[1]; |
1058 | $self->{hpos} = $_[1]; |
| 1055 | $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); |
1059 | $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); |
| 1056 | }, |
1060 | }, |
| 1057 | ; |
1061 | ; |
| 1058 | |
1062 | |
| 1059 | my $vslider = new CFPlus::UI::Slider |
1063 | my $vslider = new CFPlus::UI::Slider |
|
|
1064 | col => 1, |
|
|
1065 | row => 0, |
| 1060 | vertical => 1, |
1066 | vertical => 1, |
| 1061 | range => [0, 0, 1, 0.01], # HACK fix |
1067 | range => [0, 0, 1, 0.01], # HACK fix |
| 1062 | on_changed => sub { |
1068 | on_changed => sub { |
| 1063 | $self->{vpos} = $_[1]; |
1069 | $self->{vpos} = $_[1]; |
| 1064 | $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); |
1070 | $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); |
| … | |
… | |
| 1075 | row_expand => [1, 0], |
1081 | row_expand => [1, 0], |
| 1076 | %arg, |
1082 | %arg, |
| 1077 | ); |
1083 | ); |
| 1078 | |
1084 | |
| 1079 | $self->{vp} = new CFPlus::UI::ViewPort |
1085 | $self->{vp} = new CFPlus::UI::ViewPort |
|
|
1086 | col => 0, |
|
|
1087 | row => 0, |
| 1080 | expand => 1, |
1088 | expand => 1, |
| 1081 | scroll_x => $self->{scroll_x}, |
1089 | scroll_x => $self->{scroll_x}, |
| 1082 | scroll_y => $self->{scroll_y}, |
1090 | scroll_y => $self->{scroll_y}, |
| 1083 | on_changed => sub { |
1091 | on_changed => sub { |
| 1084 | my ($vp, $x, $y) = @_; |
1092 | my ($vp, $x, $y) = @_; |
| … | |
… | |
| 1088 | |
1096 | |
| 1089 | 0 |
1097 | 0 |
| 1090 | }, |
1098 | }, |
| 1091 | ; |
1099 | ; |
| 1092 | |
1100 | |
| 1093 | $self->SUPER::add_at (0, 0, $self->{vp}); |
1101 | $self->SUPER::add ($self->{vp}); |
| 1094 | |
1102 | |
| 1095 | $self->add ($child) if $child; |
1103 | $self->add ($child) if $child; |
| 1096 | |
1104 | |
| 1097 | $self |
1105 | $self |
| 1098 | } |
1106 | } |
| 1099 | |
|
|
| 1100 | #TODO# update range on size_allocate depending on child |
|
|
| 1101 | |
1107 | |
| 1102 | sub add { |
1108 | sub add { |
| 1103 | my ($self, $widget) = @_; |
1109 | my ($self, $widget) = @_; |
| 1104 | |
1110 | |
| 1105 | $self->{vp}->add ($self->{child} = $widget); |
1111 | $self->{vp}->add ($self->{child} = $widget); |
| … | |
… | |
| 1112 | |
1118 | |
| 1113 | my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); |
1119 | my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); |
| 1114 | $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); |
1120 | $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); |
| 1115 | |
1121 | |
| 1116 | my $visible = $w1 > $w2; |
1122 | my $visible = $w1 > $w2; |
| 1117 | if ($visible != $self->{hslider}{visible}) { |
1123 | if ($visible != $self->{hslider_visible}) { |
|
|
1124 | $self->{hslider_visible} = $visible; |
| 1118 | $visible ? $self->SUPER::add_at (0, 1, $self->{hslider}) |
1125 | $visible ? $self->SUPER::add ($self->{hslider}) |
| 1119 | : $self->{hslider}->hide; |
1126 | : $self->SUPER::remove ($self->{hslider}); |
| 1120 | } |
1127 | } |
| 1121 | |
1128 | |
| 1122 | my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); |
1129 | my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); |
| 1123 | $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); |
1130 | $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); |
| 1124 | |
1131 | |
| 1125 | my $visible = $h1 > $h2; |
1132 | my $visible = $h1 > $h2; |
| 1126 | if ($visible != $self->{vslider}{visible}) { |
1133 | if ($visible != $self->{vslider_visible}) { |
|
|
1134 | $self->{vslider_visible} = $visible; |
| 1127 | $visible ? $self->SUPER::add_at (1, 0, $self->{vslider}) |
1135 | $visible ? $self->SUPER::add ($self->{vslider}) |
| 1128 | : $self->{vslider}->hide; |
1136 | : $self->SUPER::remove ($self->{vslider}); |
|
|
1137 | } |
|
|
1138 | } |
|
|
1139 | |
|
|
1140 | sub start_dragging { |
|
|
1141 | my ($self, $ev) = @_; |
|
|
1142 | |
|
|
1143 | $self->grab_focus; |
|
|
1144 | |
|
|
1145 | my $ox = $self->{vp}{view_x}; |
|
|
1146 | my $oy = $self->{vp}{view_y}; |
|
|
1147 | |
|
|
1148 | $self->{motion} = sub { |
|
|
1149 | my ($ev, $x, $y) = @_; |
|
|
1150 | |
|
|
1151 | $ox -= $ev->{xrel}; |
|
|
1152 | $oy -= $ev->{yrel}; |
|
|
1153 | |
|
|
1154 | $self->{vp}->set_offset ($ox, $oy); |
| 1129 | } |
1155 | }; |
| 1130 | } |
|
|
| 1131 | |
|
|
| 1132 | sub update { |
|
|
| 1133 | my ($self) = @_; |
|
|
| 1134 | |
|
|
| 1135 | $self->update_slider; |
|
|
| 1136 | $self->SUPER::update; |
|
|
| 1137 | } |
1156 | } |
| 1138 | |
1157 | |
| 1139 | sub invoke_mouse_wheel { |
1158 | sub invoke_mouse_wheel { |
| 1140 | my ($self, $ev) = @_; |
1159 | my ($self, $ev) = @_; |
| 1141 | |
1160 | |
| 1142 | $self->{vslider}->emit (mouse_wheel => $ev) |
1161 | $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible}; |
| 1143 | if $ev->{dy}; |
|
|
| 1144 | |
|
|
| 1145 | $self->{hslider}->emit (mouse_wheel => $ev) |
1162 | $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible}; |
| 1146 | if $ev->{dx}; |
|
|
| 1147 | |
1163 | |
| 1148 | 1 |
1164 | 1 |
| 1149 | } |
1165 | } |
| 1150 | |
1166 | |
| 1151 | sub invoke_button_down { |
1167 | sub invoke_button_down { |
| 1152 | my ($self, $ev, $x, $y) = @_; |
1168 | my ($self, $ev, $x, $y) = @_; |
| 1153 | |
1169 | |
| 1154 | if ($ev->{button} == 2) { |
1170 | if ($ev->{button} == 2) { |
| 1155 | $self->grab_focus; |
1171 | $self->start_dragging ($ev); |
| 1156 | |
|
|
| 1157 | my $ox = $self->{vp}{view_x} + $ev->{x}; |
|
|
| 1158 | my $oy = $self->{vp}{view_y} + $ev->{y}; |
|
|
| 1159 | |
|
|
| 1160 | $self->{motion} = sub { |
|
|
| 1161 | my ($ev, $x, $y) = @_; |
|
|
| 1162 | |
|
|
| 1163 | $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y}); |
|
|
| 1164 | $self->update; |
|
|
| 1165 | }; |
|
|
| 1166 | |
|
|
| 1167 | return 1; |
1172 | return 1; |
| 1168 | } |
1173 | } |
| 1169 | |
1174 | |
| 1170 | 0 |
1175 | 0 |
| 1171 | } |
1176 | } |
| … | |
… | |
| 1581 | |
1586 | |
| 1582 | ############################################################################# |
1587 | ############################################################################# |
| 1583 | |
1588 | |
| 1584 | package CFPlus::UI::Table; |
1589 | package CFPlus::UI::Table; |
| 1585 | |
1590 | |
| 1586 | our @ISA = CFPlus::UI::Base::; |
1591 | our @ISA = CFPlus::UI::Container::; |
| 1587 | |
1592 | |
| 1588 | use List::Util qw(max sum); |
1593 | use List::Util qw(max sum); |
| 1589 | |
1594 | |
| 1590 | use CFPlus::OpenGL; |
1595 | use CFPlus::OpenGL; |
| 1591 | |
1596 | |
| 1592 | sub new { |
1597 | sub new { |
| 1593 | my $class = shift; |
1598 | my $class = shift; |
| 1594 | |
1599 | |
| 1595 | $class->SUPER::new ( |
1600 | $class->SUPER::new ( |
| 1596 | children => [], |
|
|
| 1597 | col_expand => [], |
1601 | col_expand => [], |
| 1598 | row_expand => [], |
1602 | row_expand => [], |
| 1599 | @_, |
1603 | @_, |
| 1600 | ) |
1604 | ) |
| 1601 | } |
1605 | } |
| 1602 | |
1606 | |
| 1603 | sub children { |
|
|
| 1604 | grep $_, map @$_, grep $_, @{ $_[0]{children} } |
|
|
| 1605 | } |
|
|
| 1606 | |
|
|
| 1607 | # TODO: store row/col info in child widget and use standard add/del |
|
|
| 1608 | sub add { |
1607 | sub add { |
| 1609 | my $self = shift; |
1608 | my ($self, @widgets) = @_; |
| 1610 | |
1609 | |
| 1611 | Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d# |
1610 | for my $child (@widgets) { |
| 1612 | $self->add_at (@_); |
1611 | $child->{rowspan} ||= 1; |
|
|
1612 | $child->{colspan} ||= 1; |
|
|
1613 | } |
|
|
1614 | |
|
|
1615 | $self->SUPER::add (@widgets); |
| 1613 | } |
1616 | } |
| 1614 | |
1617 | |
| 1615 | sub add_at { |
1618 | sub add_at { |
| 1616 | my $self = shift; |
1619 | my $self = shift; |
| 1617 | |
1620 | |
|
|
1621 | my @widgets; |
|
|
1622 | |
| 1618 | while (@_) { |
1623 | while (@_) { |
| 1619 | my ($col, $row, $child) = splice @_, 0, 3, (); |
1624 | my ($col, $row, $child) = splice @_, 0, 3, (); |
| 1620 | |
1625 | |
| 1621 | $child->set_parent ($self); |
1626 | $child->{row} = $row; |
| 1622 | $self->{children}[$row][$col] = $child; |
1627 | $child->{col} = $col; |
| 1623 | } |
|
|
| 1624 | |
1628 | |
| 1625 | $self->{force_realloc} = 1; |
1629 | push @widgets, $child; |
| 1626 | $self->{force_size_alloc} = 1; |
1630 | } |
| 1627 | $self->realloc; |
|
|
| 1628 | } |
|
|
| 1629 | |
1631 | |
| 1630 | sub remove { |
1632 | $self->add (@widgets); |
|
|
1633 | } |
|
|
1634 | |
|
|
1635 | sub get_wh { |
| 1631 | my ($self, $child) = @_; |
1636 | my ($self) = @_; |
| 1632 | |
1637 | |
| 1633 | for (@{ $self->{children} }) { |
1638 | my (@w, @h); |
| 1634 | for (@{ $_ || [] }) { |
1639 | |
| 1635 | $_ = undef if $_ == $child; |
1640 | my @children = $self->children; |
|
|
1641 | |
|
|
1642 | # first pass, columns |
|
|
1643 | for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { |
|
|
1644 | my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; |
|
|
1645 | |
|
|
1646 | my $sw = sum @w[$c .. $c + $cs - 1]; |
|
|
1647 | |
|
|
1648 | if ($w > $sw) { |
|
|
1649 | $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; |
| 1636 | } |
1650 | } |
| 1637 | } |
1651 | } |
| 1638 | } |
|
|
| 1639 | |
1652 | |
| 1640 | # TODO: move to container class maybe? send children a signal on removal? |
1653 | # second pass, rows |
| 1641 | sub clear { |
1654 | for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { |
| 1642 | my ($self) = @_; |
|
|
| 1643 | |
|
|
| 1644 | my @children = $self->children; |
|
|
| 1645 | delete $self->{children}; |
|
|
| 1646 | |
|
|
| 1647 | for (@children) { |
|
|
| 1648 | delete $_->{parent}; |
|
|
| 1649 | $_->hide; |
|
|
| 1650 | } |
|
|
| 1651 | |
|
|
| 1652 | $self->realloc; |
|
|
| 1653 | } |
|
|
| 1654 | |
|
|
| 1655 | sub get_wh { |
|
|
| 1656 | my ($self) = @_; |
|
|
| 1657 | |
|
|
| 1658 | my (@w, @h); |
|
|
| 1659 | |
|
|
| 1660 | for my $y (0 .. $#{$self->{children}}) { |
|
|
| 1661 | my $row = $self->{children}[$y] |
|
|
| 1662 | or next; |
|
|
| 1663 | |
|
|
| 1664 | for my $x (0 .. $#$row) { |
|
|
| 1665 | my $widget = $row->[$x] |
|
|
| 1666 | or next; |
|
|
| 1667 | my ($w, $h) = @$widget{qw(req_w req_h)}; |
1655 | my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; |
| 1668 | |
1656 | |
| 1669 | $w[$x] = max $w[$x], $w; |
1657 | my $sh = sum @h[$r .. $r + $rs - 1]; |
| 1670 | $h[$y] = max $h[$y], $h; |
1658 | |
|
|
1659 | if ($h > $sh) { |
|
|
1660 | $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; |
| 1671 | } |
1661 | } |
| 1672 | } |
1662 | } |
| 1673 | |
1663 | |
| 1674 | (\@w, \@h) |
1664 | (\@w, \@h) |
| 1675 | } |
1665 | } |
| … | |
… | |
| 1691 | my ($ws, $hs) = $self->get_wh; |
1681 | my ($ws, $hs) = $self->get_wh; |
| 1692 | |
1682 | |
| 1693 | my $req_w = (sum @$ws) || 1; |
1683 | my $req_w = (sum @$ws) || 1; |
| 1694 | my $req_h = (sum @$hs) || 1; |
1684 | my $req_h = (sum @$hs) || 1; |
| 1695 | |
1685 | |
| 1696 | # TODO: nicer code |
1686 | # now linearly scale the rows/columns to the allocated size |
| 1697 | my @col_expand = @{$self->{col_expand}}; |
1687 | my @col_expand = @{$self->{col_expand}}; |
| 1698 | @col_expand = (1) x @$ws unless @col_expand; |
1688 | @col_expand = (1) x @$ws unless @col_expand; |
| 1699 | my $col_expand = (sum @col_expand) || 1; |
1689 | my $col_expand = (sum @col_expand) || 1; |
| 1700 | |
1690 | |
| 1701 | $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; |
1691 | $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; |
| … | |
… | |
| 1708 | |
1698 | |
| 1709 | $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; |
1699 | $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; |
| 1710 | |
1700 | |
| 1711 | CFPlus::UI::harmonize $hs; |
1701 | CFPlus::UI::harmonize $hs; |
| 1712 | |
1702 | |
| 1713 | my $y; |
1703 | my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } |
|
|
1704 | my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } |
| 1714 | |
1705 | |
| 1715 | for my $r (0 .. $#{$self->{children}}) { |
1706 | for my $widget ($self->children) { |
| 1716 | my $row = $self->{children}[$r] |
1707 | my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; |
| 1717 | or next; |
|
|
| 1718 | |
1708 | |
| 1719 | my $x = 0; |
1709 | $widget->configure ( |
| 1720 | my $row_h = $hs->[$r]; |
1710 | $x[$c], $y[$r], |
|
|
1711 | $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], |
| 1721 | |
1712 | ); |
| 1722 | for my $c (0 .. $#$row) { |
|
|
| 1723 | my $col_w = $ws->[$c]; |
|
|
| 1724 | |
|
|
| 1725 | if (my $widget = $row->[$c]) { |
|
|
| 1726 | $widget->configure ($x, $y, $col_w, $row_h); |
|
|
| 1727 | } |
|
|
| 1728 | |
|
|
| 1729 | $x += $col_w; |
|
|
| 1730 | } |
|
|
| 1731 | |
|
|
| 1732 | $y += $row_h; |
|
|
| 1733 | } |
1713 | } |
| 1734 | |
1714 | |
| 1735 | 1 |
1715 | 1 |
| 1736 | } |
|
|
| 1737 | |
|
|
| 1738 | sub find_widget { |
|
|
| 1739 | my ($self, $x, $y) = @_; |
|
|
| 1740 | |
|
|
| 1741 | $x -= $self->{x}; |
|
|
| 1742 | $y -= $self->{y}; |
|
|
| 1743 | |
|
|
| 1744 | my $res; |
|
|
| 1745 | |
|
|
| 1746 | for (grep $_, map @$_, grep $_, @{ $self->{children} }) { |
|
|
| 1747 | $res = $_->find_widget ($x, $y) |
|
|
| 1748 | and return $res; |
|
|
| 1749 | } |
|
|
| 1750 | |
|
|
| 1751 | $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) |
|
|
| 1752 | } |
|
|
| 1753 | |
|
|
| 1754 | sub _draw { |
|
|
| 1755 | my ($self) = @_; |
|
|
| 1756 | |
|
|
| 1757 | for (grep $_, @{$self->{children}}) { |
|
|
| 1758 | $_->draw for grep $_, @$_; |
|
|
| 1759 | } |
|
|
| 1760 | } |
1716 | } |
| 1761 | |
1717 | |
| 1762 | ############################################################################# |
1718 | ############################################################################# |
| 1763 | |
1719 | |
| 1764 | package CFPlus::UI::Fixed; |
1720 | package CFPlus::UI::Fixed; |
