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.413 by root, Mon Jul 23 15:30:45 2007 UTC

… …
593 593
594# using global variables seems a bit hacky, but passing through all drawing 594# using global variables seems a bit hacky, but passing through all drawing
595# functions seems pointless. 595# functions seems pointless.
596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
597 597
598sub draw { 598#sub draw {
599 my ($self) = @_; 599#CFPlus.xs
600
601 return unless $self->{h} && $self->{w};
602
603 # update screen rectangle
604 local $draw_x = $draw_x + $self->{x};
605 local $draw_y = $draw_y + $self->{y};
606
607 # skip widgets that are entirely outside the drawing area
608 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
609 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
610
611 glPushMatrix;
612 glTranslate $self->{x}, $self->{y}, 0;
613
614 if ($self == $HOVER && $self->{can_hover}) {
615 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
616 glEnable GL_BLEND;
617 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
618 glBegin GL_QUADS;
619 glVertex 0 , 0;
620 glVertex $self->{w}, 0;
621 glVertex $self->{w}, $self->{h};
622 glVertex 0 , $self->{h};
623 glEnd;
624 glDisable GL_BLEND;
625 }
626
627 if ($ENV{CFPLUS_DEBUG} & 1) {
628 glPushMatrix;
629 glColor 1, 1, 0, 1;
630 glTranslate 0.375, 0.375;
631 glBegin GL_LINE_LOOP;
632 glVertex 0 , 0;
633 glVertex $self->{w} - 1, 0;
634 glVertex $self->{w} - 1, $self->{h} - 1;
635 glVertex 0 , $self->{h} - 1;
636 glEnd;
637 glPopMatrix;
638 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
639 }
640
641 $self->_draw;
642 glPopMatrix;
643}
644 600
645sub _draw { 601sub _draw {
646 my ($self) = @_; 602 my ($self) = @_;
647 603
648 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
649} 605}
650 606
651my $cntx;#d#
652sub DESTROY { 607sub DESTROY {
653 my ($self) = @_; 608 my ($self) = @_;
654 609
655 return if CFPlus::in_destruct; 610 return if CFPlus::in_destruct;
656 611
… …
741 can_events => 0, 696 can_events => 0,
742 %arg, 697 %arg,
743 ); 698 );
744 699
745 $self->add (@$children) 700 $self->add (@$children)
746 if $children; 701 if $children && @$children;
747 702
748 $self 703 $self
749} 704}
750 705
751sub realloc { 706sub realloc {
… …
760 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
761 716
762 $_->set_parent ($self) 717 $_->set_parent ($self)
763 for @widgets; 718 for @widgets;
764 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
765 use sort 'stable'; 721 use sort 'stable';
766 722
767 $self->{children} = [ 723 $self->{children} = [
768 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
769 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
770 ]; 726 ];
771 727
772 $self->realloc; 728 $self->realloc;
729
730 $self->emit (c_add => \@widgets);
731
732 map $_+0, @widgets
773} 733}
774 734
775sub children { 735sub children {
776 @{ $_[0]{children} } 736 @{ $_[0]{children} }
777} 737}
778 738
779sub remove { 739sub remove {
780 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
781 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
782 delete $child->{parent}; 745 delete $child->{parent};
783 $child->hide; 746 $child->hide;
784
785 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
786 749
787 $self->realloc; 750 $self->realloc;
788} 751}
789 752
790sub clear { 753sub clear {
791 my ($self) = @_; 754 my ($self) = @_;
792 755
793 my $children = delete $self->{children}; 756 my $children = $self->{children};
794 $self->{children} = []; 757 $self->{children} = [];
795 758
796 for (@$children) { 759 for (@$children) {
797 delete $_->{parent}; 760 delete $_->{parent};
798 $_->hide; 761 $_->hide;
… …
818} 781}
819 782
820sub _draw { 783sub _draw {
821 my ($self) = @_; 784 my ($self) = @_;
822 785
823 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
824} 787}
825 788
826############################################################################# 789#############################################################################
827 790
828package CFPlus::UI::Bin; 791package CFPlus::UI::Bin;
… …
838} 801}
839 802
840sub add { 803sub add {
841 my ($self, $child) = @_; 804 my ($self, $child) = @_;
842 805
843 $self->SUPER::remove ($_) for @{ $self->{children} }; 806 $self->clear;
844 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
845} 808}
846 809
847sub remove { 810sub remove {
848 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
… …
958sub size_request { 921sub size_request {
959 my ($self) = @_; 922 my ($self) = @_;
960 923
961 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 924 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
962 925
963 $w = 10 if $self->{scroll_x}; 926 $w = 1 if $self->{scroll_x};
964 $h = 10 if $self->{scroll_y}; 927 $h = 1 if $self->{scroll_y};
965 928
966 ($w, $h) 929 ($w, $h)
967} 930}
968 931
969sub invoke_size_allocate { 932sub invoke_size_allocate {
… …
1046 my $child = delete $arg{child}; 1009 my $child = delete $arg{child};
1047 1010
1048 my $self; 1011 my $self;
1049 1012
1050 my $hslider = new CFPlus::UI::Slider 1013 my $hslider = new CFPlus::UI::Slider
1014 col => 0,
1015 row => 1,
1051 vertical => 0, 1016 vertical => 0,
1052 range => [0, 0, 1, 0.01], # HACK fix 1017 range => [0, 0, 1, 0.01], # HACK fix
1053 on_changed => sub { 1018 on_changed => sub {
1054 $self->{hpos} = $_[1]; 1019 $self->{hpos} = $_[1];
1055 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1020 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1056 }, 1021 },
1057 ; 1022 ;
1058 1023
1059 my $vslider = new CFPlus::UI::Slider 1024 my $vslider = new CFPlus::UI::Slider
1025 col => 1,
1026 row => 0,
1060 vertical => 1, 1027 vertical => 1,
1061 range => [0, 0, 1, 0.01], # HACK fix 1028 range => [0, 0, 1, 0.01], # HACK fix
1062 on_changed => sub { 1029 on_changed => sub {
1063 $self->{vpos} = $_[1]; 1030 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1031 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1075 row_expand => [1, 0], 1042 row_expand => [1, 0],
1076 %arg, 1043 %arg,
1077 ); 1044 );
1078 1045
1079 $self->{vp} = new CFPlus::UI::ViewPort 1046 $self->{vp} = new CFPlus::UI::ViewPort
1047 col => 0,
1048 row => 0,
1080 expand => 1, 1049 expand => 1,
1081 scroll_x => $self->{scroll_x}, 1050 scroll_x => $self->{scroll_x},
1082 scroll_y => $self->{scroll_y}, 1051 scroll_y => $self->{scroll_y},
1083 on_changed => sub { 1052 on_changed => sub {
1084 my ($vp, $x, $y) = @_; 1053 my ($vp, $x, $y) = @_;
… …
1086 $vp->{parent}{hslider}->set_value ($x); 1055 $vp->{parent}{hslider}->set_value ($x);
1087 $vp->{parent}{vslider}->set_value ($y); 1056 $vp->{parent}{vslider}->set_value ($y);
1088 1057
1089 0 1058 0
1090 }, 1059 },
1060 on_size_allocate => sub {
1061 my ($vp, $w, $h) = @_;
1062 $vp->{parent}->update_slider;
1063 0
1064 },
1091 ; 1065 ;
1092 1066
1093 $self->SUPER::add_at (0, 0, $self->{vp}); 1067 $self->SUPER::add ($self->{vp});
1094 1068
1095 $self->add ($child) if $child; 1069 $self->add ($child) if $child;
1096 1070
1097 $self 1071 $self
1098} 1072}
1099
1100#TODO# update range on size_allocate depending on child
1101 1073
1102sub add { 1074sub add {
1103 my ($self, $widget) = @_; 1075 my ($self, $widget) = @_;
1104 1076
1105 $self->{vp}->add ($self->{child} = $widget); 1077 $self->{vp}->add ($self->{child} = $widget);
… …
1108sub update_slider { 1080sub update_slider {
1109 my ($self) = @_; 1081 my ($self) = @_;
1110 1082
1111 my $child = ($self->{vp} or return)->child; 1083 my $child = ($self->{vp} or return)->child;
1112 1084
1085 if ($self->{scroll_x}) {
1113 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1086 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1114 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1087 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1115 1088
1116 my $visible = $w1 > $w2; 1089 my $visible = $w1 > $w2;
1117 if ($visible != $self->{hslider}{visible}) { 1090 if ($visible != $self->{hslider_visible}) {
1091 $self->{hslider_visible} = $visible;
1118 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider}) 1092 $visible ? $self->SUPER::add ($self->{hslider})
1119 : $self->{hslider}->hide; 1093 : $self->SUPER::remove ($self->{hslider});
1094 }
1120 } 1095 }
1121 1096
1097 if ($self->{scroll_y}) {
1122 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1098 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1123 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1099 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1124 1100
1125 my $visible = $h1 > $h2; 1101 my $visible = $h1 > $h2;
1126 if ($visible != $self->{vslider}{visible}) { 1102 if ($visible != $self->{vslider_visible}) {
1103 $self->{vslider_visible} = $visible;
1127 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider}) 1104 $visible ? $self->SUPER::add ($self->{vslider})
1128 : $self->{vslider}->hide; 1105 : $self->SUPER::remove ($self->{vslider});
1106 }
1107 }
1108}
1109
1110sub start_dragging {
1111 my ($self, $ev) = @_;
1112
1113 $self->grab_focus;
1114
1115 my $ox = $self->{vp}{view_x};
1116 my $oy = $self->{vp}{view_y};
1117
1118 $self->{motion} = sub {
1119 my ($ev, $x, $y) = @_;
1120
1121 $ox -= $ev->{xrel};
1122 $oy -= $ev->{yrel};
1123
1124 $self->{vp}->set_offset ($ox, $oy);
1129 } 1125 };
1130}
1131
1132sub update {
1133 my ($self) = @_;
1134
1135 $self->update_slider;
1136 $self->SUPER::update;
1137} 1126}
1138 1127
1139sub invoke_mouse_wheel { 1128sub invoke_mouse_wheel {
1140 my ($self, $ev) = @_; 1129 my ($self, $ev) = @_;
1141 1130
1142 $self->{vslider}->emit (mouse_wheel => $ev) 1131 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1143 if $ev->{dy};
1144
1145 $self->{hslider}->emit (mouse_wheel => $ev) 1132 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1146 if $ev->{dx};
1147 1133
1148 1 1134 1
1149} 1135}
1150 1136
1151sub invoke_button_down { 1137sub invoke_button_down {
1152 my ($self, $ev, $x, $y) = @_; 1138 my ($self, $ev, $x, $y) = @_;
1153 1139
1154 if ($ev->{button} == 2) { 1140 if ($ev->{button} == 2) {
1155 $self->grab_focus; 1141 $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; 1142 return 1;
1168 } 1143 }
1169 1144
1170 0 1145 0
1171} 1146}
… …
1581 1556
1582############################################################################# 1557#############################################################################
1583 1558
1584package CFPlus::UI::Table; 1559package CFPlus::UI::Table;
1585 1560
1586our @ISA = CFPlus::UI::Base::; 1561our @ISA = CFPlus::UI::Container::;
1587 1562
1588use List::Util qw(max sum); 1563use List::Util qw(max sum);
1589 1564
1590use CFPlus::OpenGL; 1565use CFPlus::OpenGL;
1591 1566
1592sub new { 1567sub new {
1593 my $class = shift; 1568 my $class = shift;
1594 1569
1595 $class->SUPER::new ( 1570 $class->SUPER::new (
1596 children => [],
1597 col_expand => [], 1571 col_expand => [],
1598 row_expand => [], 1572 row_expand => [],
1599 @_, 1573 @_,
1600 ) 1574 )
1601} 1575}
1602 1576
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 { 1577sub add {
1609 my $self = shift; 1578 my ($self, @widgets) = @_;
1610 1579
1611 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d# 1580 for my $child (@widgets) {
1612 $self->add_at (@_); 1581 $child->{rowspan} ||= 1;
1582 $child->{colspan} ||= 1;
1583 }
1584
1585 $self->SUPER::add (@widgets);
1613} 1586}
1614 1587
1615sub add_at { 1588sub add_at {
1616 my $self = shift; 1589 my $self = shift;
1617 1590
1591 my @widgets;
1592
1618 while (@_) { 1593 while (@_) {
1619 my ($col, $row, $child) = splice @_, 0, 3, (); 1594 my ($col, $row, $child) = splice @_, 0, 3, ();
1620 1595
1621 $child->set_parent ($self); 1596 $child->{row} = $row;
1622 $self->{children}[$row][$col] = $child; 1597 $child->{col} = $col;
1623 }
1624 1598
1625 $self->{force_realloc} = 1; 1599 push @widgets, $child;
1626 $self->{force_size_alloc} = 1; 1600 }
1627 $self->realloc;
1628}
1629 1601
1630sub remove { 1602 $self->add (@widgets);
1603}
1604
1605sub get_wh {
1631 my ($self, $child) = @_; 1606 my ($self) = @_;
1632 1607
1633 for (@{ $self->{children} }) { 1608 my (@w, @h);
1634 for (@{ $_ || [] }) { 1609
1635 $_ = undef if $_ == $child; 1610 my @children = $self->children;
1611
1612 # first pass, columns
1613 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1614 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1615
1616 my $sw = sum @w[$c .. $c + $cs - 1];
1617
1618 if ($w > $sw) {
1619 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1636 } 1620 }
1637 } 1621 }
1638}
1639 1622
1640# TODO: move to container class maybe? send children a signal on removal? 1623 # second pass, rows
1641sub clear { 1624 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)}; 1625 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1668 1626
1669 $w[$x] = max $w[$x], $w; 1627 my $sh = sum @h[$r .. $r + $rs - 1];
1670 $h[$y] = max $h[$y], $h; 1628
1629 if ($h > $sh) {
1630 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1671 } 1631 }
1672 } 1632 }
1673 1633
1674 (\@w, \@h) 1634 (\@w, \@h)
1675} 1635}
… …
1691 my ($ws, $hs) = $self->get_wh; 1651 my ($ws, $hs) = $self->get_wh;
1692 1652
1693 my $req_w = (sum @$ws) || 1; 1653 my $req_w = (sum @$ws) || 1;
1694 my $req_h = (sum @$hs) || 1; 1654 my $req_h = (sum @$hs) || 1;
1695 1655
1696 # TODO: nicer code 1656 # now linearly scale the rows/columns to the allocated size
1697 my @col_expand = @{$self->{col_expand}}; 1657 my @col_expand = @{$self->{col_expand}};
1698 @col_expand = (1) x @$ws unless @col_expand; 1658 @col_expand = (1) x @$ws unless @col_expand;
1699 my $col_expand = (sum @col_expand) || 1; 1659 my $col_expand = (sum @col_expand) || 1;
1700 1660
1701 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1661 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1708 1668
1709 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1669 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1710 1670
1711 CFPlus::UI::harmonize $hs; 1671 CFPlus::UI::harmonize $hs;
1712 1672
1713 my $y; 1673 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1674 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1714 1675
1715 for my $r (0 .. $#{$self->{children}}) { 1676 for my $widget ($self->children) {
1716 my $row = $self->{children}[$r] 1677 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1717 or next;
1718 1678
1719 my $x = 0; 1679 $widget->configure (
1720 my $row_h = $hs->[$r]; 1680 $x[$c], $y[$r],
1681 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1721 1682 );
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 } 1683 }
1734 1684
1735 1 1685 1
1736} 1686}
1737 1687
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}
1761
1762############################################################################# 1688#############################################################################
1763 1689
1764package CFPlus::UI::Fixed; 1690package CFPlus::UI::Fixed;
1765 1691
1766use List::Util qw(min max); 1692use List::Util qw(min max);
1767 1693
1768our @ISA = CFPlus::UI::Container::; 1694our @ISA = CFPlus::UI::Container::;
1769 1695
1770sub add {
1771 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1772
1773 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1774 $self->SUPER::add ($child);
1775}
1776
1777sub _scale($$$) { 1696sub _scale($$$) {
1778 my ($mode, $val, $max) = @_; 1697 my ($rel, $val, $max) = @_;
1779 1698
1780 $mode eq "abs" ? $val 1699 $rel ? $val * $max : $val
1781 : $mode eq "rel" ? $val * $max
1782 : 0
1783} 1700}
1784 1701
1785sub size_request { 1702sub size_request {
1786 my ($self) = @_; 1703 my ($self) = @_;
1787 1704
1788 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1705 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1789 1706
1790 # determine overall size by querying abs widgets 1707 # determine overall size by querying abs widgets
1791 for my $child ($self->visible_children) { 1708 for my $child ($self->visible_children) {
1792 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1709 unless ($child->{c_rel}) {
1710 my $x = $child->{c_x};
1711 my $y = $child->{c_y};
1793 1712
1794 if ($pos eq "abs") {
1795 $w = _scale $size, $w, $child->{req_w};
1796 $h = _scale $size, $h, $child->{req_h};
1797
1798 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1713 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1799 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1714 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1800 } 1715 }
1801 } 1716 }
1802 1717
1803 my $W = $x2 - $x1; 1718 my $W = $x2 - $x1;
1804 my $H = $y2 - $y1; 1719 my $H = $y2 - $y1;
1805 1720
1806 # now layout remaining widgets 1721 # now layout remaining widgets
1807 for my $child ($self->visible_children) { 1722 for my $child ($self->visible_children) {
1808 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1723 if ($child->{c_rel}) {
1724 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1725 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1809 1726
1810 if ($pos ne "abs") {
1811 $x = _scale $pos, $x, $W;
1812 $y = _scale $pos, $x, $H;
1813 $w = _scale $size, $w, $child->{req_w};
1814 $h = _scale $size, $h, $child->{req_h};
1815
1816 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1727 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1817 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1728 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1818 } 1729 }
1819 } 1730 }
1820 1731
1821 my $W = $x2 - $x1; 1732 my $W = $x2 - $x1;
1822 my $H = $y2 - $y1; 1733 my $H = $y2 - $y1;
… …
1826 1737
1827sub invoke_size_allocate { 1738sub invoke_size_allocate {
1828 my ($self, $W, $H) = @_; 1739 my ($self, $W, $H) = @_;
1829 1740
1830 for my $child ($self->visible_children) { 1741 for my $child ($self->visible_children) {
1831 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1742 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1743 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1832 1744
1833 $x = _scale $pos, $x, $W; 1745 $x += $child->{c_halign} * $child->{req_w};
1834 $y = _scale $pos, $x, $H; 1746 $y += $child->{c_valign} * $child->{req_h};
1835 $w = _scale $size, $w, $child->{req_w};
1836 $h = _scale $size, $h, $child->{req_h};
1837 1747
1838 $child->configure ($x, $y, $w, $h); 1748 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1839 } 1749 }
1840 1750
1841 1 1751 1
1842} 1752}
1843 1753
… …
1847 1757
1848our @ISA = CFPlus::UI::Container::; 1758our @ISA = CFPlus::UI::Container::;
1849 1759
1850sub size_request { 1760sub size_request {
1851 my ($self) = @_; 1761 my ($self) = @_;
1762
1763 my @children = $self->visible_children;
1852 1764
1853 $self->{vertical} 1765 $self->{vertical}
1854 ? ( 1766 ? (
1855 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1767 (List::Util::max map $_->{req_w}, @children),
1856 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1768 (List::Util::sum map $_->{req_h}, @children),
1857 ) 1769 )
1858 : ( 1770 : (
1859 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1771 (List::Util::sum map $_->{req_w}, @children),
1860 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1772 (List::Util::max map $_->{req_h}, @children),
1861 ) 1773 )
1862} 1774}
1863 1775
1864sub invoke_size_allocate { 1776sub invoke_size_allocate {
1865 my ($self, $w, $h) = @_; 1777 my ($self, $w, $h) = @_;
… …
2106 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2018 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2107 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2019 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2108 : ($self->{h} - $size->[1]) * 0.5); 2020 : ($self->{h} - $size->[1]) * 0.5);
2109 }; 2021 };
2110 2022
2111 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2023# unless ($self->{list}) {
2112 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2024# $self->{list} = CFPlus::OpenGL::glGenList;
2025# CFPlus::OpenGL::glNewList $self->{list};
2026# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2027# CFPlus::OpenGL::glEndList;
2028# }
2029#
2030# CFPlus::OpenGL::glCallList $self->{list};
2113 2031
2114 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2032 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2115} 2033}
2034
2035#sub destroy {
2036# my ($self) = @_;
2037#
2038# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2039#
2040# $self->SUPER::destroy;
2041#}
2116 2042
2117############################################################################# 2043#############################################################################
2118 2044
2119package CFPlus::UI::EntryBase; 2045package CFPlus::UI::EntryBase;
2120 2046
… …
2905 2831
2906 $self->SUPER::invoke_button_down ($ev, $x, $y); 2832 $self->SUPER::invoke_button_down ($ev, $x, $y);
2907 2833
2908 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2834 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2909 2835
2910 $self->invoke_mouse_motion ($ev, $x, $y) 2836 $self->invoke_mouse_motion ($ev, $x, $y);
2837
2838 1
2911} 2839}
2912 2840
2913sub invoke_mouse_motion { 2841sub invoke_mouse_motion {
2914 my ($self, $ev, $x, $y) = @_; 2842 my ($self, $ev, $x, $y) = @_;
2915 2843
… …
2935 2863
2936 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 2864 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2937 2865
2938 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 2866 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2939 2867
2940 ! ! $delta 2868 1
2941} 2869}
2942 2870
2943sub update { 2871sub update {
2944 my ($self) = @_; 2872 my ($self) = @_;
2945 2873
… …
3076} 3004}
3077 3005
3078sub size_request { 3006sub size_request {
3079 my ($self) = @_; 3007 my ($self) = @_;
3080 3008
3081 my ($empty, $slider) = @{ $self->{children} }; 3009 my ($empty, $slider) = $self->visible_children;
3082 3010
3083 local $self->{children} = [$empty, $slider]; 3011 local $self->{children} = [$empty, $slider];
3084 $self->SUPER::size_request 3012 $self->SUPER::size_request
3085} 3013}
3086 3014
… …
3518 3446
3519 if ($self->{anim} && $self->{animspeed}) { 3447 if ($self->{anim} && $self->{animspeed}) {
3520 CFPlus::weaken (my $widget = $self); 3448 CFPlus::weaken (my $widget = $self);
3521 3449
3522 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3450 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3523 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3451 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3524 $self->{timer} = Event->timer ( 3452 $self->{timer} = Event->timer (
3525 parked => 1, 3453 parked => 1,
3526 cb => sub { 3454 cb => sub {
3527 return unless $::CONN && $widget; 3455 return unless $::CONN && $widget;
3528 3456
… …
3565 3493
3566 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3494 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3567 if ($anim && @$anim) { 3495 if ($anim && @$anim) {
3568 delete $self->{wait_face}; 3496 delete $self->{wait_face};
3569 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3497 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3498 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3570 } 3499 }
3571 } 3500 }
3572} 3501}
3573 3502
3574sub size_request { 3503sub size_request {
3575 my ($self) = @_; 3504 my ($self) = @_;
3576 3505
3577 if ($::CONN) { 3506 if ($::CONN) {
3578 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3507 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3579 if (my $tex = $::CONN->{texture}[$faceid]) { 3508 if (my $tex = $::CONN->{texture}[$faceid]) {
3509 $self->{tex} = $tex;
3580 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3510 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3581 } else { 3511 } else {
3582 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3512 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3583 $self->realloc; 3513 $self->realloc;
3584 }); 3514 });
… …
3606} 3536}
3607 3537
3608sub _draw { 3538sub _draw {
3609 my ($self) = @_; 3539 my ($self) = @_;
3610 3540
3611 return unless $::CONN;
3612
3613 $self->SUPER::_draw; 3541 $self->SUPER::_draw;
3614 3542
3615 my $faceid = $::CONN->{faceid}[$self->{face}] 3543 if (my $tex = $self->{tex}) {
3616 or return;
3617
3618 my $tex = $::CONN->{texture}[$faceid];
3619
3620 if ($tex) {
3621 glEnable GL_TEXTURE_2D; 3544 glEnable GL_TEXTURE_2D;
3622 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3545 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3623 glColor 0, 0, 0, 1; 3546 glColor 0, 0, 0, 1;
3624 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3547 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3625 glDisable GL_TEXTURE_2D; 3548 glDisable GL_TEXTURE_2D;
… …
3827 ); 3750 );
3828 3751
3829 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3752 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3830 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3753 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3831 3754
3755 {
3756 Scalar::Util::weaken (my $wself = $self);
3757
3758 $self->{multiplexer}->connect (c_add => sub {
3759 my ($mplex, $widgets) = @_;
3760
3761 for my $child (@$widgets) {
3762 Scalar::Util::weaken $child;
3763 $child->{c_tab_} ||= do {
3764 my $tab =
3765 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3766 ? $child->{c_tab}
3767 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3768
3769 $tab->connect (activate => sub {
3770 $wself->set_current_page ($child);
3771 });
3772
3773 $tab
3774 };
3775
3776 $self->{buttonbar}->add ($child->{c_tab_});
3777 }
3778 });
3779
3780 $self->{multiplexer}->connect (c_remove => sub {
3781 my ($mplex, $widgets) = @_;
3782
3783 for my $child (@$widgets) {
3784 $wself->{buttonbar}->remove ($child->{c_tab_});
3785 }
3786 });
3787 }
3788
3832 $self 3789 $self
3833} 3790}
3834 3791
3835sub add { 3792sub add {
3793 my ($self, @widgets) = @_;
3794
3795 $self->{multiplexer}->add (@widgets)
3796}
3797
3798sub remove {
3799 my ($self, @widgets) = @_;
3800
3801 $self->{multiplexer}->remove (@widgets)
3802}
3803
3804sub add_tab {
3836 my ($self, $title, $widget, $tooltip) = @_; 3805 my ($self, $title, $widget, $tooltip) = @_;
3837 3806
3838 CFPlus::weaken $self; 3807 $title = [$title, $tooltip] unless ref $title;
3808 $widget->{c_tab} = $title;
3839 3809
3840 $self->{buttonbar}->add (new CFPlus::UI::Button
3841 markup => $title,
3842 tooltip => $tooltip,
3843 on_activate => sub { $self->set_current_page ($widget) },
3844 );
3845
3846 $self->{multiplexer}->add ($widget); 3810 $self->add ($widget);
3847} 3811}
3848 3812
3849sub get_current_page { 3813sub get_current_page {
3850 my ($self) = @_; 3814 my ($self) = @_;
3851 3815
… …
4181 while ($self->{refresh_hook}) { 4145 while ($self->{refresh_hook}) {
4182 $_->() 4146 $_->()
4183 for values %{delete $self->{refresh_hook}}; 4147 for values %{delete $self->{refresh_hook}};
4184 } 4148 }
4185 4149
4186 if ($self->{realloc}) { 4150 while ($self->{realloc}) {
4187 my %queue; 4151 my %queue;
4188 my @queue; 4152 my @queue;
4189 my $widget; 4153 my $widget;
4190 4154
4191 outer: 4155 outer:
… …
4238 } 4202 }
4239 } 4203 }
4240 4204
4241 delete $self->{realloc}{$widget+0}; 4205 delete $self->{realloc}{$widget+0};
4242 } 4206 }
4243 }
4244 4207
4245 while (my $size_alloc = delete $self->{size_alloc}) { 4208 while (my $size_alloc = delete $self->{size_alloc}) {
4246 my @queue = sort { $b->{visible} <=> $a->{visible} } 4209 my @queue = sort { $a->{visible} <=> $b->{visible} }
4247 values %$size_alloc; 4210 values %$size_alloc;
4248 4211
4249 while () { 4212 while () {
4250 my $widget = pop @queue || last; 4213 my $widget = pop @queue || last;
4251 4214
4252 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4215 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4253 4216
4254 $w = 0 if $w < 0;
4255 $h = 0 if $h < 0;
4256
4257 $w = max $widget->{min_w}, $w; 4217 $w = max $widget->{min_w}, $w;
4258 $h = max $widget->{min_h}, $h; 4218 $h = max $widget->{min_h}, $h;
4259 4219
4260# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4220# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4261# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4221# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4262 4222
4263 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4223 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4264 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4224 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4265 4225
4266 $w = int $w + 0.5; 4226 $w = int $w + 0.5;
4267 $h = int $h + 0.5; 4227 $h = int $h + 0.5;
4268 4228
4269 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4229 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4270 $widget->{old_w} = $widget->{w}; 4230 $widget->{old_w} = $widget->{w};
4271 $widget->{old_h} = $widget->{h}; 4231 $widget->{old_h} = $widget->{h};
4272 4232
4273 $widget->{w} = $w; 4233 $widget->{w} = $w;
4274 $widget->{h} = $h; 4234 $widget->{h} = $h;
4275 4235
4276 $widget->emit (size_allocate => $w, $h); 4236 $widget->emit (size_allocate => $w, $h);
4237 }
4277 } 4238 }
4278 } 4239 }
4279 } 4240 }
4280 4241
4281 while ($self->{post_alloc_hook}) { 4242 while ($self->{post_alloc_hook}) {

Diff Legend

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