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.386 by root, Fri Jul 20 16:33:45 2007 UTC vs.
Revision 1.395 by root, Sat Jul 21 13:56:00 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);
… …
746 can_events => 0, 741 can_events => 0,
747 %arg, 742 %arg,
748 ); 743 );
749 744
750 $self->add (@$children) 745 $self->add (@$children)
751 if $children; 746 if $children && @$children;
752 747
753 $self 748 $self
754} 749}
755 750
756sub realloc { 751sub realloc {
… …
765 my ($self, @widgets) = @_; 760 my ($self, @widgets) = @_;
766 761
767 $_->set_parent ($self) 762 $_->set_parent ($self)
768 for @widgets; 763 for @widgets;
769 764
765 # TODO: only do this in widgets that need it, e.g. root, fixed
770 use sort 'stable'; 766 use sort 'stable';
771 767
772 $self->{children} = [ 768 $self->{children} = [
773 sort { $a->{z} <=> $b->{z} } 769 sort { $a->{z} <=> $b->{z} }
774 @{$self->{children}}, @widgets 770 @{$self->{children}}, @widgets
… …
793} 789}
794 790
795sub clear { 791sub clear {
796 my ($self) = @_; 792 my ($self) = @_;
797 793
798 my $children = delete $self->{children}; 794 my $children = $self->{children};
799 $self->{children} = []; 795 $self->{children} = [];
800 796
801 for (@$children) { 797 for (@$children) {
802 delete $_->{parent}; 798 delete $_->{parent};
803 $_->hide; 799 $_->hide;
… …
963sub size_request { 959sub size_request {
964 my ($self) = @_; 960 my ($self) = @_;
965 961
966 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
967 963
968 $w = 10 if $self->{scroll_x}; 964 $w = 1 if $self->{scroll_x};
969 $h = 10 if $self->{scroll_y}; 965 $h = 1 if $self->{scroll_y};
970 966
971 ($w, $h) 967 ($w, $h)
972} 968}
973 969
974sub invoke_size_allocate { 970sub invoke_size_allocate {
… …
1020 my ($self, $x, $y) = @_; 1016 my ($self, $x, $y) = @_;
1021 1017
1022 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1018 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1023 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1019 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1024 ) { 1020 ) {
1025 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1021 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1026 } else { 1022 } else {
1027 $self->CFPlus::UI::Base::find_widget ($x, $y) 1023 $self->CFPlus::UI::Base::find_widget ($x, $y)
1028 } 1024 }
1029} 1025}
1030 1026
… …
1051 my $child = delete $arg{child}; 1047 my $child = delete $arg{child};
1052 1048
1053 my $self; 1049 my $self;
1054 1050
1055 my $hslider = new CFPlus::UI::Slider 1051 my $hslider = new CFPlus::UI::Slider
1052 col => 0,
1053 row => 1,
1056 vertical => 0, 1054 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix 1055 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub { 1056 on_changed => sub {
1059 $self->{hpos} = $_[1]; 1057 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 }, 1059 },
1062 ; 1060 ;
1063 1061
1064 my $vslider = new CFPlus::UI::Slider 1062 my $vslider = new CFPlus::UI::Slider
1063 col => 1,
1064 row => 0,
1065 vertical => 1, 1065 vertical => 1,
1066 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
1067 on_changed => sub { 1067 on_changed => sub {
1068 $self->{vpos} = $_[1]; 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1080 row_expand => [1, 0], 1080 row_expand => [1, 0],
1081 %arg, 1081 %arg,
1082 ); 1082 );
1083 1083
1084 $self->{vp} = new CFPlus::UI::ViewPort 1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 col => 0,
1086 row => 0,
1085 expand => 1, 1087 expand => 1,
1086 scroll_x => $self->{scroll_x}, 1088 scroll_x => $self->{scroll_x},
1087 scroll_y => $self->{scroll_y}, 1089 scroll_y => $self->{scroll_y},
1088 on_changed => sub { 1090 on_changed => sub {
1089 my ($vp, $x, $y) = @_; 1091 my ($vp, $x, $y) = @_;
… …
1093 1095
1094 0 1096 0
1095 }, 1097 },
1096 ; 1098 ;
1097 1099
1098 $self->SUPER::add_at (0, 0, $self->{vp}); 1100 $self->SUPER::add ($self->{vp});
1099 1101
1100 $self->add ($child) if $child; 1102 $self->add ($child) if $child;
1101 1103
1102 $self 1104 $self
1103} 1105}
1104
1105#TODO# update range on size_allocate depending on child
1106 1106
1107sub add { 1107sub add {
1108 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
1109 1109
1110 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
… …
1117 1117
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1119 $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]);
1120 1120
1121 my $visible = $w1 > $w2; 1121 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) { 1122 if ($visible != $self->{hslider_visible}) {
1123 $self->{hslider_visible} = $visible;
1123 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider}) 1124 $visible ? $self->SUPER::add ($self->{hslider})
1124 : $self->{hslider}->hide; 1125 : $self->SUPER::remove ($self->{hslider});
1125 } 1126 }
1126 1127
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1128 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1128 $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]);
1129 1130
1130 my $visible = $h1 > $h2; 1131 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) { 1132 if ($visible != $self->{vslider_visible}) {
1133 $self->{vslider_visible} = $visible;
1132 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider}) 1134 $visible ? $self->SUPER::add ($self->{vslider})
1133 : $self->{vslider}->hide; 1135 : $self->SUPER::remove ($self->{vslider});
1134 } 1136 }
1135}
1136
1137sub update {
1138 my ($self) = @_;
1139
1140 $self->update_slider;
1141 $self->SUPER::update;
1142} 1137}
1143 1138
1144sub invoke_mouse_wheel { 1139sub invoke_mouse_wheel {
1145 my ($self, $ev) = @_; 1140 my ($self, $ev) = @_;
1146 1141
1147 return 0 unless $ev->{dy}; # only vertical movements for now
1148
1149 $self->{vslider}->emit (mouse_wheel => $ev); 1142 $self->{vslider}->emit (mouse_wheel => $ev)
1143 if $ev->{dy};
1144
1145 $self->{hslider}->emit (mouse_wheel => $ev)
1146 if $ev->{dx};
1150 1147
1151 1 1148 1
1152} 1149}
1153 1150
1154sub invoke_button_down { 1151sub invoke_button_down {
… …
1584 1581
1585############################################################################# 1582#############################################################################
1586 1583
1587package CFPlus::UI::Table; 1584package CFPlus::UI::Table;
1588 1585
1589our @ISA = CFPlus::UI::Base::; 1586our @ISA = CFPlus::UI::Container::;
1590 1587
1591use List::Util qw(max sum); 1588use List::Util qw(max sum);
1592 1589
1593use CFPlus::OpenGL; 1590use CFPlus::OpenGL;
1594 1591
1595sub new { 1592sub new {
1596 my $class = shift; 1593 my $class = shift;
1597 1594
1598 $class->SUPER::new ( 1595 $class->SUPER::new (
1599 children => [],
1600 col_expand => [], 1596 col_expand => [],
1601 row_expand => [], 1597 row_expand => [],
1602 @_, 1598 @_,
1603 ) 1599 )
1604} 1600}
1605 1601
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 { 1602sub add {
1612 my $self = shift; 1603 my ($self, @widgets) = @_;
1613 1604
1614 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d# 1605 for my $child (@widgets) {
1615 $self->add_at (@_); 1606 $child->{rowspan} ||= 1;
1607 $child->{colspan} ||= 1;
1608 }
1609
1610 $self->SUPER::add (@widgets);
1616} 1611}
1617 1612
1618sub add_at { 1613sub add_at {
1619 my $self = shift; 1614 my $self = shift;
1620 1615
1616 my @widgets;
1617
1621 while (@_) { 1618 while (@_) {
1622 my ($col, $row, $child) = splice @_, 0, 3, (); 1619 my ($col, $row, $child) = splice @_, 0, 3, ();
1623 1620
1624 $child->set_parent ($self); 1621 $child->{row} = $row;
1625 $self->{children}[$row][$col] = $child; 1622 $child->{col} = $col;
1626 }
1627 1623
1628 $self->{force_realloc} = 1; 1624 push @widgets, $child;
1629 $self->{force_size_alloc} = 1; 1625 }
1630 $self->realloc;
1631}
1632 1626
1633sub remove { 1627 $self->add (@widgets);
1628}
1629
1630sub get_wh {
1634 my ($self, $child) = @_; 1631 my ($self) = @_;
1635 1632
1636 for (@{ $self->{children} }) { 1633 my (@w, @h);
1637 for (@{ $_ || [] }) { 1634
1638 $_ = undef if $_ == $child; 1635 my @children = $self->children;
1636
1637 # first pass, columns
1638 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1639 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1640
1641 my $sw = sum @w[$c .. $c + $cs - 1];
1642
1643 if ($w > $sw) {
1644 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1639 } 1645 }
1640 } 1646 }
1641}
1642 1647
1643# TODO: move to container class maybe? send children a signal on removal? 1648 # second pass, rows
1644sub clear { 1649 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)}; 1650 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1671 1651
1672 $w[$x] = max $w[$x], $w; 1652 my $sh = sum @h[$r .. $r + $rs - 1];
1673 $h[$y] = max $h[$y], $h; 1653
1654 if ($h > $sh) {
1655 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1674 } 1656 }
1675 } 1657 }
1676 1658
1677 (\@w, \@h) 1659 (\@w, \@h)
1678} 1660}
… …
1694 my ($ws, $hs) = $self->get_wh; 1676 my ($ws, $hs) = $self->get_wh;
1695 1677
1696 my $req_w = (sum @$ws) || 1; 1678 my $req_w = (sum @$ws) || 1;
1697 my $req_h = (sum @$hs) || 1; 1679 my $req_h = (sum @$hs) || 1;
1698 1680
1699 # TODO: nicer code 1681 # now linearly scale the rows/columns to the allocated size
1700 my @col_expand = @{$self->{col_expand}}; 1682 my @col_expand = @{$self->{col_expand}};
1701 @col_expand = (1) x @$ws unless @col_expand; 1683 @col_expand = (1) x @$ws unless @col_expand;
1702 my $col_expand = (sum @col_expand) || 1; 1684 my $col_expand = (sum @col_expand) || 1;
1703 1685
1704 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1686 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1711 1693
1712 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1694 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1713 1695
1714 CFPlus::UI::harmonize $hs; 1696 CFPlus::UI::harmonize $hs;
1715 1697
1716 my $y; 1698 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1699 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1717 1700
1718 for my $r (0 .. $#{$self->{children}}) { 1701 for my $widget ($self->children) {
1719 my $row = $self->{children}[$r] 1702 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1720 or next;
1721 1703
1722 my $x = 0; 1704 $widget->configure (
1723 my $row_h = $hs->[$r]; 1705 $x[$c], $y[$r],
1706 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1724 1707 );
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 } 1708 }
1737 1709
1738 1 1710 1
1739}
1740
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} 1711}
1764 1712
1765############################################################################# 1713#############################################################################
1766 1714
1767package CFPlus::UI::Fixed; 1715package CFPlus::UI::Fixed;

Diff Legend

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