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.387 by root, Fri Jul 20 18:19:45 2007 UTC vs.
Revision 1.411 by root, Sun Jul 22 19:34:59 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 }
… …
589 593
590# 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
591# functions seems pointless. 595# functions seems pointless.
592our ($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
593 597
594sub draw { 598#sub draw {
595 my ($self) = @_; 599#CFPlus.xs
596
597 return unless $self->{h} && $self->{w};
598
599 # update screen rectangle
600 local $draw_x = $draw_x + $self->{x};
601 local $draw_y = $draw_y + $self->{y};
602
603 # skip widgets that are entirely outside the drawing area
604 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
605 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
606
607 glPushMatrix;
608 glTranslate $self->{x}, $self->{y}, 0;
609
610 if ($self == $HOVER && $self->{can_hover}) {
611 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
612 glEnable GL_BLEND;
613 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
614 glBegin GL_QUADS;
615 glVertex 0 , 0;
616 glVertex $self->{w}, 0;
617 glVertex $self->{w}, $self->{h};
618 glVertex 0 , $self->{h};
619 glEnd;
620 glDisable GL_BLEND;
621 }
622
623 if ($ENV{CFPLUS_DEBUG} & 1) {
624 glPushMatrix;
625 glColor 1, 1, 0, 1;
626 glTranslate 0.375, 0.375;
627 glBegin GL_LINE_LOOP;
628 glVertex 0 , 0;
629 glVertex $self->{w} - 1, 0;
630 glVertex $self->{w} - 1, $self->{h} - 1;
631 glVertex 0 , $self->{h} - 1;
632 glEnd;
633 glPopMatrix;
634 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
635 }
636
637 $self->_draw;
638 glPopMatrix;
639}
640 600
641sub _draw { 601sub _draw {
642 my ($self) = @_; 602 my ($self) = @_;
643 603
644 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
645} 605}
646 606
647my $cntx;#d#
648sub DESTROY { 607sub DESTROY {
649 my ($self) = @_; 608 my ($self) = @_;
650 609
651 return if CFPlus::in_destruct; 610 return if CFPlus::in_destruct;
652 611
… …
737 can_events => 0, 696 can_events => 0,
738 %arg, 697 %arg,
739 ); 698 );
740 699
741 $self->add (@$children) 700 $self->add (@$children)
742 if $children; 701 if $children && @$children;
743 702
744 $self 703 $self
745} 704}
746 705
747sub realloc { 706sub realloc {
… …
756 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
757 716
758 $_->set_parent ($self) 717 $_->set_parent ($self)
759 for @widgets; 718 for @widgets;
760 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
761 use sort 'stable'; 721 use sort 'stable';
762 722
763 $self->{children} = [ 723 $self->{children} = [
764 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
765 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
766 ]; 726 ];
767 727
768 $self->realloc; 728 $self->realloc;
729
730 map $_+0, @widgets
769} 731}
770 732
771sub children { 733sub children {
772 @{ $_[0]{children} } 734 @{ $_[0]{children} }
773} 735}
… …
784} 746}
785 747
786sub clear { 748sub clear {
787 my ($self) = @_; 749 my ($self) = @_;
788 750
789 my $children = delete $self->{children}; 751 my $children = $self->{children};
790 $self->{children} = []; 752 $self->{children} = [];
791 753
792 for (@$children) { 754 for (@$children) {
793 delete $_->{parent}; 755 delete $_->{parent};
794 $_->hide; 756 $_->hide;
… …
954sub size_request { 916sub size_request {
955 my ($self) = @_; 917 my ($self) = @_;
956 918
957 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 919 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
958 920
959 $w = 10 if $self->{scroll_x}; 921 $w = 1 if $self->{scroll_x};
960 $h = 10 if $self->{scroll_y}; 922 $h = 1 if $self->{scroll_y};
961 923
962 ($w, $h) 924 ($w, $h)
963} 925}
964 926
965sub invoke_size_allocate { 927sub invoke_size_allocate {
… …
1042 my $child = delete $arg{child}; 1004 my $child = delete $arg{child};
1043 1005
1044 my $self; 1006 my $self;
1045 1007
1046 my $hslider = new CFPlus::UI::Slider 1008 my $hslider = new CFPlus::UI::Slider
1009 col => 0,
1010 row => 1,
1047 vertical => 0, 1011 vertical => 0,
1048 range => [0, 0, 1, 0.01], # HACK fix 1012 range => [0, 0, 1, 0.01], # HACK fix
1049 on_changed => sub { 1013 on_changed => sub {
1050 $self->{hpos} = $_[1]; 1014 $self->{hpos} = $_[1];
1051 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1052 }, 1016 },
1053 ; 1017 ;
1054 1018
1055 my $vslider = new CFPlus::UI::Slider 1019 my $vslider = new CFPlus::UI::Slider
1020 col => 1,
1021 row => 0,
1056 vertical => 1, 1022 vertical => 1,
1057 range => [0, 0, 1, 0.01], # HACK fix 1023 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub { 1024 on_changed => sub {
1059 $self->{vpos} = $_[1]; 1025 $self->{vpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1071 row_expand => [1, 0], 1037 row_expand => [1, 0],
1072 %arg, 1038 %arg,
1073 ); 1039 );
1074 1040
1075 $self->{vp} = new CFPlus::UI::ViewPort 1041 $self->{vp} = new CFPlus::UI::ViewPort
1042 col => 0,
1043 row => 0,
1076 expand => 1, 1044 expand => 1,
1077 scroll_x => $self->{scroll_x}, 1045 scroll_x => $self->{scroll_x},
1078 scroll_y => $self->{scroll_y}, 1046 scroll_y => $self->{scroll_y},
1079 on_changed => sub { 1047 on_changed => sub {
1080 my ($vp, $x, $y) = @_; 1048 my ($vp, $x, $y) = @_;
… …
1082 $vp->{parent}{hslider}->set_value ($x); 1050 $vp->{parent}{hslider}->set_value ($x);
1083 $vp->{parent}{vslider}->set_value ($y); 1051 $vp->{parent}{vslider}->set_value ($y);
1084 1052
1085 0 1053 0
1086 }, 1054 },
1055 on_size_allocate => sub {
1056 my ($vp, $w, $h) = @_;
1057 $vp->{parent}->update_slider;
1058 0
1059 },
1087 ; 1060 ;
1088 1061
1089 $self->SUPER::add_at (0, 0, $self->{vp}); 1062 $self->SUPER::add ($self->{vp});
1090 1063
1091 $self->add ($child) if $child; 1064 $self->add ($child) if $child;
1092 1065
1093 $self 1066 $self
1094} 1067}
1095
1096#TODO# update range on size_allocate depending on child
1097 1068
1098sub add { 1069sub add {
1099 my ($self, $widget) = @_; 1070 my ($self, $widget) = @_;
1100 1071
1101 $self->{vp}->add ($self->{child} = $widget); 1072 $self->{vp}->add ($self->{child} = $widget);
… …
1104sub update_slider { 1075sub update_slider {
1105 my ($self) = @_; 1076 my ($self) = @_;
1106 1077
1107 my $child = ($self->{vp} or return)->child; 1078 my $child = ($self->{vp} or return)->child;
1108 1079
1080 if ($self->{scroll_x}) {
1109 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1081 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1110 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1082 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1111 1083
1112 my $visible = $w1 > $w2; 1084 my $visible = $w1 > $w2;
1113 if ($visible != $self->{hslider}{visible}) { 1085 if ($visible != $self->{hslider_visible}) {
1086 $self->{hslider_visible} = $visible;
1114 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider}) 1087 $visible ? $self->SUPER::add ($self->{hslider})
1115 : $self->{hslider}->hide; 1088 : $self->SUPER::remove ($self->{hslider});
1089 }
1116 } 1090 }
1117 1091
1092 if ($self->{scroll_y}) {
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1093 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1094 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120 1095
1121 my $visible = $h1 > $h2; 1096 my $visible = $h1 > $h2;
1122 if ($visible != $self->{vslider}{visible}) { 1097 if ($visible != $self->{vslider_visible}) {
1098 $self->{vslider_visible} = $visible;
1123 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider}) 1099 $visible ? $self->SUPER::add ($self->{vslider})
1124 : $self->{vslider}->hide; 1100 : $self->SUPER::remove ($self->{vslider});
1101 }
1102 }
1103}
1104
1105sub start_dragging {
1106 my ($self, $ev) = @_;
1107
1108 $self->grab_focus;
1109
1110 my $ox = $self->{vp}{view_x};
1111 my $oy = $self->{vp}{view_y};
1112
1113 $self->{motion} = sub {
1114 my ($ev, $x, $y) = @_;
1115
1116 $ox -= $ev->{xrel};
1117 $oy -= $ev->{yrel};
1118
1119 $self->{vp}->set_offset ($ox, $oy);
1125 } 1120 };
1126}
1127
1128sub update {
1129 my ($self) = @_;
1130
1131 $self->update_slider;
1132 $self->SUPER::update;
1133} 1121}
1134 1122
1135sub invoke_mouse_wheel { 1123sub invoke_mouse_wheel {
1136 my ($self, $ev) = @_; 1124 my ($self, $ev) = @_;
1137 1125
1138 return 0 unless $ev->{dy}; # only vertical movements for now
1139
1140 $self->{vslider}->emit (mouse_wheel => $ev); 1126 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1127 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1141 1128
1142 1 1129 1
1143} 1130}
1144 1131
1145sub invoke_button_down { 1132sub invoke_button_down {
1146 my ($self, $ev, $x, $y) = @_; 1133 my ($self, $ev, $x, $y) = @_;
1147 1134
1148 if ($ev->{button} == 2) { 1135 if ($ev->{button} == 2) {
1149 $self->grab_focus; 1136 $self->start_dragging ($ev);
1150
1151 my $ox = $self->{vp}{view_x} + $ev->{x};
1152 my $oy = $self->{vp}{view_y} + $ev->{y};
1153
1154 $self->{motion} = sub {
1155 my ($ev, $x, $y) = @_;
1156
1157 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1158 $self->update;
1159 };
1160
1161 return 1; 1137 return 1;
1162 } 1138 }
1163 1139
1164 0 1140 0
1165} 1141}
… …
1575 1551
1576############################################################################# 1552#############################################################################
1577 1553
1578package CFPlus::UI::Table; 1554package CFPlus::UI::Table;
1579 1555
1580our @ISA = CFPlus::UI::Base::; 1556our @ISA = CFPlus::UI::Container::;
1581 1557
1582use List::Util qw(max sum); 1558use List::Util qw(max sum);
1583 1559
1584use CFPlus::OpenGL; 1560use CFPlus::OpenGL;
1585 1561
1586sub new { 1562sub new {
1587 my $class = shift; 1563 my $class = shift;
1588 1564
1589 $class->SUPER::new ( 1565 $class->SUPER::new (
1590 children => [],
1591 col_expand => [], 1566 col_expand => [],
1592 row_expand => [], 1567 row_expand => [],
1593 @_, 1568 @_,
1594 ) 1569 )
1595} 1570}
1596 1571
1597sub children {
1598 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1599}
1600
1601# TODO: store row/col info in child widget and use standard add/del
1602sub add { 1572sub add {
1603 my $self = shift; 1573 my ($self, @widgets) = @_;
1604 1574
1605 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d# 1575 for my $child (@widgets) {
1606 $self->add_at (@_); 1576 $child->{rowspan} ||= 1;
1577 $child->{colspan} ||= 1;
1578 }
1579
1580 $self->SUPER::add (@widgets);
1607} 1581}
1608 1582
1609sub add_at { 1583sub add_at {
1610 my $self = shift; 1584 my $self = shift;
1611 1585
1586 my @widgets;
1587
1612 while (@_) { 1588 while (@_) {
1613 my ($col, $row, $child) = splice @_, 0, 3, (); 1589 my ($col, $row, $child) = splice @_, 0, 3, ();
1614 1590
1615 $child->set_parent ($self); 1591 $child->{row} = $row;
1616 $self->{children}[$row][$col] = $child; 1592 $child->{col} = $col;
1617 }
1618 1593
1619 $self->{force_realloc} = 1; 1594 push @widgets, $child;
1620 $self->{force_size_alloc} = 1; 1595 }
1621 $self->realloc;
1622}
1623 1596
1624sub remove { 1597 $self->add (@widgets);
1598}
1599
1600sub get_wh {
1625 my ($self, $child) = @_; 1601 my ($self) = @_;
1626 1602
1627 for (@{ $self->{children} }) { 1603 my (@w, @h);
1628 for (@{ $_ || [] }) { 1604
1629 $_ = undef if $_ == $child; 1605 my @children = $self->children;
1606
1607 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1610
1611 my $sw = sum @w[$c .. $c + $cs - 1];
1612
1613 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1630 } 1615 }
1631 } 1616 }
1632}
1633 1617
1634# TODO: move to container class maybe? send children a signal on removal? 1618 # second pass, rows
1635sub clear { 1619 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1636 my ($self) = @_;
1637
1638 my @children = $self->children;
1639 delete $self->{children};
1640
1641 for (@children) {
1642 delete $_->{parent};
1643 $_->hide;
1644 }
1645
1646 $self->realloc;
1647}
1648
1649sub get_wh {
1650 my ($self) = @_;
1651
1652 my (@w, @h);
1653
1654 for my $y (0 .. $#{$self->{children}}) {
1655 my $row = $self->{children}[$y]
1656 or next;
1657
1658 for my $x (0 .. $#$row) {
1659 my $widget = $row->[$x]
1660 or next;
1661 my ($w, $h) = @$widget{qw(req_w req_h)}; 1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1662 1621
1663 $w[$x] = max $w[$x], $w; 1622 my $sh = sum @h[$r .. $r + $rs - 1];
1664 $h[$y] = max $h[$y], $h; 1623
1624 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1665 } 1626 }
1666 } 1627 }
1667 1628
1668 (\@w, \@h) 1629 (\@w, \@h)
1669} 1630}
… …
1685 my ($ws, $hs) = $self->get_wh; 1646 my ($ws, $hs) = $self->get_wh;
1686 1647
1687 my $req_w = (sum @$ws) || 1; 1648 my $req_w = (sum @$ws) || 1;
1688 my $req_h = (sum @$hs) || 1; 1649 my $req_h = (sum @$hs) || 1;
1689 1650
1690 # TODO: nicer code 1651 # now linearly scale the rows/columns to the allocated size
1691 my @col_expand = @{$self->{col_expand}}; 1652 my @col_expand = @{$self->{col_expand}};
1692 @col_expand = (1) x @$ws unless @col_expand; 1653 @col_expand = (1) x @$ws unless @col_expand;
1693 my $col_expand = (sum @col_expand) || 1; 1654 my $col_expand = (sum @col_expand) || 1;
1694 1655
1695 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1656 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1702 1663
1703 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1664 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1704 1665
1705 CFPlus::UI::harmonize $hs; 1666 CFPlus::UI::harmonize $hs;
1706 1667
1707 my $y; 1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1708 1670
1709 for my $r (0 .. $#{$self->{children}}) { 1671 for my $widget ($self->children) {
1710 my $row = $self->{children}[$r] 1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1711 or next;
1712 1673
1713 my $x = 0; 1674 $widget->configure (
1714 my $row_h = $hs->[$r]; 1675 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1715 1677 );
1716 for my $c (0 .. $#$row) {
1717 my $col_w = $ws->[$c];
1718
1719 if (my $widget = $row->[$c]) {
1720 $widget->configure ($x, $y, $col_w, $row_h);
1721 }
1722
1723 $x += $col_w;
1724 }
1725
1726 $y += $row_h;
1727 } 1678 }
1728 1679
1729 1 1680 1
1730} 1681}
1731 1682
1732sub find_widget {
1733 my ($self, $x, $y) = @_;
1734
1735 $x -= $self->{x};
1736 $y -= $self->{y};
1737
1738 my $res;
1739
1740 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1741 $res = $_->find_widget ($x, $y)
1742 and return $res;
1743 }
1744
1745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1746}
1747
1748sub _draw {
1749 my ($self) = @_;
1750
1751 for (grep $_, @{$self->{children}}) {
1752 $_->draw for grep $_, @$_;
1753 }
1754}
1755
1756############################################################################# 1683#############################################################################
1757 1684
1758package CFPlus::UI::Fixed; 1685package CFPlus::UI::Fixed;
1759 1686
1760use List::Util qw(min max); 1687use List::Util qw(min max);
1761 1688
1762our @ISA = CFPlus::UI::Container::; 1689our @ISA = CFPlus::UI::Container::;
1763 1690
1764sub add {
1765 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1766
1767 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1768 $self->SUPER::add ($child);
1769}
1770
1771sub _scale($$$) { 1691sub _scale($$$) {
1772 my ($mode, $val, $max) = @_; 1692 my ($rel, $val, $max) = @_;
1773 1693
1774 $mode eq "abs" ? $val 1694 $rel ? $val * $max : $val
1775 : $mode eq "rel" ? $val * $max
1776 : 0
1777} 1695}
1778 1696
1779sub size_request { 1697sub size_request {
1780 my ($self) = @_; 1698 my ($self) = @_;
1781 1699
1782 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1700 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1783 1701
1784 # determine overall size by querying abs widgets 1702 # determine overall size by querying abs widgets
1785 for my $child ($self->visible_children) { 1703 for my $child ($self->visible_children) {
1786 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1704 unless ($child->{c_rel}) {
1705 my $x = $child->{c_x};
1706 my $y = $child->{c_y};
1787 1707
1788 if ($pos eq "abs") {
1789 $w = _scale $size, $w, $child->{req_w};
1790 $h = _scale $size, $h, $child->{req_h};
1791
1792 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1708 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1793 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1709 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1794 } 1710 }
1795 } 1711 }
1796 1712
1797 my $W = $x2 - $x1; 1713 my $W = $x2 - $x1;
1798 my $H = $y2 - $y1; 1714 my $H = $y2 - $y1;
1799 1715
1800 # now layout remaining widgets 1716 # now layout remaining widgets
1801 for my $child ($self->visible_children) { 1717 for my $child ($self->visible_children) {
1802 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1718 if ($child->{c_rel}) {
1719 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1720 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1803 1721
1804 if ($pos ne "abs") {
1805 $x = _scale $pos, $x, $W;
1806 $y = _scale $pos, $x, $H;
1807 $w = _scale $size, $w, $child->{req_w};
1808 $h = _scale $size, $h, $child->{req_h};
1809
1810 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1722 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1811 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1723 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1812 } 1724 }
1813 } 1725 }
1814 1726
1815 my $W = $x2 - $x1; 1727 my $W = $x2 - $x1;
1816 my $H = $y2 - $y1; 1728 my $H = $y2 - $y1;
… …
1820 1732
1821sub invoke_size_allocate { 1733sub invoke_size_allocate {
1822 my ($self, $W, $H) = @_; 1734 my ($self, $W, $H) = @_;
1823 1735
1824 for my $child ($self->visible_children) { 1736 for my $child ($self->visible_children) {
1825 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1737 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1738 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1826 1739
1827 $x = _scale $pos, $x, $W; 1740 $x += $child->{c_halign} * $child->{req_w};
1828 $y = _scale $pos, $x, $H; 1741 $y += $child->{c_valign} * $child->{req_h};
1829 $w = _scale $size, $w, $child->{req_w};
1830 $h = _scale $size, $h, $child->{req_h};
1831 1742
1832 $child->configure ($x, $y, $w, $h); 1743 $child->configure ($x, $y, $child->{req_w}, $child->{req_h});
1833 } 1744 }
1834 1745
1835 1 1746 1
1836} 1747}
1837 1748
… …
2100 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2011 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2101 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2012 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2102 : ($self->{h} - $size->[1]) * 0.5); 2013 : ($self->{h} - $size->[1]) * 0.5);
2103 }; 2014 };
2104 2015
2105 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2016# unless ($self->{list}) {
2106 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2017# $self->{list} = CFPlus::OpenGL::glGenList;
2018# CFPlus::OpenGL::glNewList $self->{list};
2019# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2020# CFPlus::OpenGL::glEndList;
2021# }
2022#
2023# CFPlus::OpenGL::glCallList $self->{list};
2107 2024
2108 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2025 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2109} 2026}
2027
2028#sub destroy {
2029# my ($self) = @_;
2030#
2031# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2032#
2033# $self->SUPER::destroy;
2034#}
2110 2035
2111############################################################################# 2036#############################################################################
2112 2037
2113package CFPlus::UI::EntryBase; 2038package CFPlus::UI::EntryBase;
2114 2039
… …
2899 2824
2900 $self->SUPER::invoke_button_down ($ev, $x, $y); 2825 $self->SUPER::invoke_button_down ($ev, $x, $y);
2901 2826
2902 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2827 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2903 2828
2904 $self->invoke_mouse_motion ($ev, $x, $y) 2829 $self->invoke_mouse_motion ($ev, $x, $y);
2830
2831 1
2905} 2832}
2906 2833
2907sub invoke_mouse_motion { 2834sub invoke_mouse_motion {
2908 my ($self, $ev, $x, $y) = @_; 2835 my ($self, $ev, $x, $y) = @_;
2909 2836
… …
2929 2856
2930 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 2857 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2931 2858
2932 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 2859 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2933 2860
2934 ! ! $delta 2861 1
2935} 2862}
2936 2863
2937sub update { 2864sub update {
2938 my ($self) = @_; 2865 my ($self) = @_;
2939 2866
… …
3512 3439
3513 if ($self->{anim} && $self->{animspeed}) { 3440 if ($self->{anim} && $self->{animspeed}) {
3514 CFPlus::weaken (my $widget = $self); 3441 CFPlus::weaken (my $widget = $self);
3515 3442
3516 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3443 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3517 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3444 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3518 $self->{timer} = Event->timer ( 3445 $self->{timer} = Event->timer (
3519 parked => 1, 3446 parked => 1,
3520 cb => sub { 3447 cb => sub {
3521 return unless $::CONN && $widget; 3448 return unless $::CONN && $widget;
3522 3449
… …
3559 3486
3560 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3487 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3561 if ($anim && @$anim) { 3488 if ($anim && @$anim) {
3562 delete $self->{wait_face}; 3489 delete $self->{wait_face};
3563 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3490 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3491 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3564 } 3492 }
3565 } 3493 }
3566} 3494}
3567 3495
3568sub size_request { 3496sub size_request {
3569 my ($self) = @_; 3497 my ($self) = @_;
3570 3498
3571 if ($::CONN) { 3499 if ($::CONN) {
3572 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3500 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3573 if (my $tex = $::CONN->{texture}[$faceid]) { 3501 if (my $tex = $::CONN->{texture}[$faceid]) {
3502 $self->{tex} = $tex;
3574 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3503 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3575 } else { 3504 } else {
3576 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3505 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3577 $self->realloc; 3506 $self->realloc;
3578 }); 3507 });
… …
3600} 3529}
3601 3530
3602sub _draw { 3531sub _draw {
3603 my ($self) = @_; 3532 my ($self) = @_;
3604 3533
3605 return unless $::CONN;
3606
3607 $self->SUPER::_draw; 3534 $self->SUPER::_draw;
3608 3535
3609 my $faceid = $::CONN->{faceid}[$self->{face}] 3536 if (my $tex = $self->{tex}) {
3610 or return;
3611
3612 my $tex = $::CONN->{texture}[$faceid];
3613
3614 if ($tex) {
3615 glEnable GL_TEXTURE_2D; 3537 glEnable GL_TEXTURE_2D;
3616 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3538 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3617 glColor 0, 0, 0, 1; 3539 glColor 0, 0, 0, 1;
3618 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3540 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3619 glDisable GL_TEXTURE_2D; 3541 glDisable GL_TEXTURE_2D;
… …
3829sub add { 3751sub add {
3830 my ($self, $title, $widget, $tooltip) = @_; 3752 my ($self, $title, $widget, $tooltip) = @_;
3831 3753
3832 CFPlus::weaken $self; 3754 CFPlus::weaken $self;
3833 3755
3834 $self->{buttonbar}->add (new CFPlus::UI::Button 3756 unless (ref $title) {
3757 $title = new CFPlus::UI::Button
3835 markup => $title, 3758 markup => $title,
3836 tooltip => $tooltip, 3759 tooltip => $tooltip,
3760 ;
3761 }
3762
3837 on_activate => sub { $self->set_current_page ($widget) }, 3763 $title->connect (activate => sub { $self->set_current_page ($widget) });
3838 ); 3764 $self->{buttonbar}->add ($title);
3839 3765
3840 $self->{multiplexer}->add ($widget); 3766 $self->{multiplexer}->add ($widget);
3841} 3767}
3842 3768
3843sub get_current_page { 3769sub get_current_page {
… …
4175 while ($self->{refresh_hook}) { 4101 while ($self->{refresh_hook}) {
4176 $_->() 4102 $_->()
4177 for values %{delete $self->{refresh_hook}}; 4103 for values %{delete $self->{refresh_hook}};
4178 } 4104 }
4179 4105
4180 if ($self->{realloc}) { 4106 while ($self->{realloc}) {
4181 my %queue; 4107 my %queue;
4182 my @queue; 4108 my @queue;
4183 my $widget; 4109 my $widget;
4184 4110
4185 outer: 4111 outer:
… …
4232 } 4158 }
4233 } 4159 }
4234 4160
4235 delete $self->{realloc}{$widget+0}; 4161 delete $self->{realloc}{$widget+0};
4236 } 4162 }
4237 }
4238 4163
4239 while (my $size_alloc = delete $self->{size_alloc}) { 4164 while (my $size_alloc = delete $self->{size_alloc}) {
4240 my @queue = sort { $b->{visible} <=> $a->{visible} } 4165 my @queue = sort { $a->{visible} <=> $b->{visible} }
4241 values %$size_alloc; 4166 values %$size_alloc;
4242 4167
4243 while () { 4168 while () {
4244 my $widget = pop @queue || last; 4169 my $widget = pop @queue || last;
4245 4170
4246 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4171 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4247 4172
4248 $w = 0 if $w < 0;
4249 $h = 0 if $h < 0;
4250
4251 $w = max $widget->{min_w}, $w; 4173 $w = max $widget->{min_w}, $w;
4252 $h = max $widget->{min_h}, $h; 4174 $h = max $widget->{min_h}, $h;
4253 4175
4254# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4176# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4255# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4177# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4256 4178
4257 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4179 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4258 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4180 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4259 4181
4260 $w = int $w + 0.5; 4182 $w = int $w + 0.5;
4261 $h = int $h + 0.5; 4183 $h = int $h + 0.5;
4262 4184
4263 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4264 $widget->{old_w} = $widget->{w}; 4186 $widget->{old_w} = $widget->{w};
4265 $widget->{old_h} = $widget->{h}; 4187 $widget->{old_h} = $widget->{h};
4266 4188
4267 $widget->{w} = $w; 4189 $widget->{w} = $w;
4268 $widget->{h} = $h; 4190 $widget->{h} = $h;
4269 4191
4270 $widget->emit (size_allocate => $w, $h); 4192 $widget->emit (size_allocate => $w, $h);
4193 }
4271 } 4194 }
4272 } 4195 }
4273 } 4196 }
4274 4197
4275 while ($self->{post_alloc_hook}) { 4198 while ($self->{post_alloc_hook}) {

Diff Legend

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