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.388 by root, Fri Jul 20 18:30:03 2007 UTC vs.
Revision 1.398 by root, Sat Jul 21 14:32:10 2007 UTC

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

Diff Legend

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