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.413 by root, Mon Jul 23 15:30:45 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 $self->emit (c_add => \@widgets);
731
732 map $_+0, @widgets
769} 733}
770 734
771sub children { 735sub children {
772 @{ $_[0]{children} } 736 @{ $_[0]{children} }
773} 737}
774 738
775sub remove { 739sub remove {
776 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
777 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
778 delete $child->{parent}; 745 delete $child->{parent};
779 $child->hide; 746 $child->hide;
780
781 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
782 749
783 $self->realloc; 750 $self->realloc;
784} 751}
785 752
786sub clear { 753sub clear {
787 my ($self) = @_; 754 my ($self) = @_;
788 755
789 my $children = delete $self->{children}; 756 my $children = $self->{children};
790 $self->{children} = []; 757 $self->{children} = [];
791 758
792 for (@$children) { 759 for (@$children) {
793 delete $_->{parent}; 760 delete $_->{parent};
794 $_->hide; 761 $_->hide;
… …
814} 781}
815 782
816sub _draw { 783sub _draw {
817 my ($self) = @_; 784 my ($self) = @_;
818 785
819 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
820} 787}
821 788
822############################################################################# 789#############################################################################
823 790
824package CFPlus::UI::Bin; 791package CFPlus::UI::Bin;
… …
834} 801}
835 802
836sub add { 803sub add {
837 my ($self, $child) = @_; 804 my ($self, $child) = @_;
838 805
839 $self->SUPER::remove ($_) for @{ $self->{children} }; 806 $self->clear;
840 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
841} 808}
842 809
843sub remove { 810sub remove {
844 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
… …
954sub size_request { 921sub size_request {
955 my ($self) = @_; 922 my ($self) = @_;
956 923
957 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 924 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
958 925
959 $w = 10 if $self->{scroll_x}; 926 $w = 1 if $self->{scroll_x};
960 $h = 10 if $self->{scroll_y}; 927 $h = 1 if $self->{scroll_y};
961 928
962 ($w, $h) 929 ($w, $h)
963} 930}
964 931
965sub invoke_size_allocate { 932sub invoke_size_allocate {
… …
1042 my $child = delete $arg{child}; 1009 my $child = delete $arg{child};
1043 1010
1044 my $self; 1011 my $self;
1045 1012
1046 my $hslider = new CFPlus::UI::Slider 1013 my $hslider = new CFPlus::UI::Slider
1014 col => 0,
1015 row => 1,
1047 vertical => 0, 1016 vertical => 0,
1048 range => [0, 0, 1, 0.01], # HACK fix 1017 range => [0, 0, 1, 0.01], # HACK fix
1049 on_changed => sub { 1018 on_changed => sub {
1050 $self->{hpos} = $_[1]; 1019 $self->{hpos} = $_[1];
1051 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1020 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1052 }, 1021 },
1053 ; 1022 ;
1054 1023
1055 my $vslider = new CFPlus::UI::Slider 1024 my $vslider = new CFPlus::UI::Slider
1025 col => 1,
1026 row => 0,
1056 vertical => 1, 1027 vertical => 1,
1057 range => [0, 0, 1, 0.01], # HACK fix 1028 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub { 1029 on_changed => sub {
1059 $self->{vpos} = $_[1]; 1030 $self->{vpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1031 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1071 row_expand => [1, 0], 1042 row_expand => [1, 0],
1072 %arg, 1043 %arg,
1073 ); 1044 );
1074 1045
1075 $self->{vp} = new CFPlus::UI::ViewPort 1046 $self->{vp} = new CFPlus::UI::ViewPort
1047 col => 0,
1048 row => 0,
1076 expand => 1, 1049 expand => 1,
1077 scroll_x => $self->{scroll_x}, 1050 scroll_x => $self->{scroll_x},
1078 scroll_y => $self->{scroll_y}, 1051 scroll_y => $self->{scroll_y},
1079 on_changed => sub { 1052 on_changed => sub {
1080 my ($vp, $x, $y) = @_; 1053 my ($vp, $x, $y) = @_;
… …
1082 $vp->{parent}{hslider}->set_value ($x); 1055 $vp->{parent}{hslider}->set_value ($x);
1083 $vp->{parent}{vslider}->set_value ($y); 1056 $vp->{parent}{vslider}->set_value ($y);
1084 1057
1085 0 1058 0
1086 }, 1059 },
1060 on_size_allocate => sub {
1061 my ($vp, $w, $h) = @_;
1062 $vp->{parent}->update_slider;
1063 0
1064 },
1087 ; 1065 ;
1088 1066
1089 $self->SUPER::add_at (0, 0, $self->{vp}); 1067 $self->SUPER::add ($self->{vp});
1090 1068
1091 $self->add ($child) if $child; 1069 $self->add ($child) if $child;
1092 1070
1093 $self 1071 $self
1094} 1072}
1095
1096#TODO# update range on size_allocate depending on child
1097 1073
1098sub add { 1074sub add {
1099 my ($self, $widget) = @_; 1075 my ($self, $widget) = @_;
1100 1076
1101 $self->{vp}->add ($self->{child} = $widget); 1077 $self->{vp}->add ($self->{child} = $widget);
… …
1104sub update_slider { 1080sub update_slider {
1105 my ($self) = @_; 1081 my ($self) = @_;
1106 1082
1107 my $child = ($self->{vp} or return)->child; 1083 my $child = ($self->{vp} or return)->child;
1108 1084
1085 if ($self->{scroll_x}) {
1109 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1086 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1110 $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]);
1111 1088
1112 my $visible = $w1 > $w2; 1089 my $visible = $w1 > $w2;
1113 if ($visible != $self->{hslider}{visible}) { 1090 if ($visible != $self->{hslider_visible}) {
1091 $self->{hslider_visible} = $visible;
1114 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider}) 1092 $visible ? $self->SUPER::add ($self->{hslider})
1115 : $self->{hslider}->hide; 1093 : $self->SUPER::remove ($self->{hslider});
1094 }
1116 } 1095 }
1117 1096
1097 if ($self->{scroll_y}) {
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1098 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1119 $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]);
1120 1100
1121 my $visible = $h1 > $h2; 1101 my $visible = $h1 > $h2;
1122 if ($visible != $self->{vslider}{visible}) { 1102 if ($visible != $self->{vslider_visible}) {
1103 $self->{vslider_visible} = $visible;
1123 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider}) 1104 $visible ? $self->SUPER::add ($self->{vslider})
1124 : $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);
1125 } 1125 };
1126}
1127
1128sub update {
1129 my ($self) = @_;
1130
1131 $self->update_slider;
1132 $self->SUPER::update;
1133} 1126}
1134 1127
1135sub invoke_mouse_wheel { 1128sub invoke_mouse_wheel {
1136 my ($self, $ev) = @_; 1129 my ($self, $ev) = @_;
1137 1130
1138 return 0 unless $ev->{dy}; # only vertical movements for now
1139
1140 $self->{vslider}->emit (mouse_wheel => $ev); 1131 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1132 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1141 1133
1142 1 1134 1
1143} 1135}
1144 1136
1145sub invoke_button_down { 1137sub invoke_button_down {
1146 my ($self, $ev, $x, $y) = @_; 1138 my ($self, $ev, $x, $y) = @_;
1147 1139
1148 if ($ev->{button} == 2) { 1140 if ($ev->{button} == 2) {
1149 $self->grab_focus; 1141 $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; 1142 return 1;
1162 } 1143 }
1163 1144
1164 0 1145 0
1165} 1146}
… …
1575 1556
1576############################################################################# 1557#############################################################################
1577 1558
1578package CFPlus::UI::Table; 1559package CFPlus::UI::Table;
1579 1560
1580our @ISA = CFPlus::UI::Base::; 1561our @ISA = CFPlus::UI::Container::;
1581 1562
1582use List::Util qw(max sum); 1563use List::Util qw(max sum);
1583 1564
1584use CFPlus::OpenGL; 1565use CFPlus::OpenGL;
1585 1566
1586sub new { 1567sub new {
1587 my $class = shift; 1568 my $class = shift;
1588 1569
1589 $class->SUPER::new ( 1570 $class->SUPER::new (
1590 children => [],
1591 col_expand => [], 1571 col_expand => [],
1592 row_expand => [], 1572 row_expand => [],
1593 @_, 1573 @_,
1594 ) 1574 )
1595} 1575}
1596 1576
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 { 1577sub add {
1603 my $self = shift; 1578 my ($self, @widgets) = @_;
1604 1579
1605 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d# 1580 for my $child (@widgets) {
1606 $self->add_at (@_); 1581 $child->{rowspan} ||= 1;
1582 $child->{colspan} ||= 1;
1583 }
1584
1585 $self->SUPER::add (@widgets);
1607} 1586}
1608 1587
1609sub add_at { 1588sub add_at {
1610 my $self = shift; 1589 my $self = shift;
1611 1590
1591 my @widgets;
1592
1612 while (@_) { 1593 while (@_) {
1613 my ($col, $row, $child) = splice @_, 0, 3, (); 1594 my ($col, $row, $child) = splice @_, 0, 3, ();
1614 1595
1615 $child->set_parent ($self); 1596 $child->{row} = $row;
1616 $self->{children}[$row][$col] = $child; 1597 $child->{col} = $col;
1617 }
1618 1598
1619 $self->{force_realloc} = 1; 1599 push @widgets, $child;
1620 $self->{force_size_alloc} = 1; 1600 }
1621 $self->realloc;
1622}
1623 1601
1624sub remove { 1602 $self->add (@widgets);
1603}
1604
1605sub get_wh {
1625 my ($self, $child) = @_; 1606 my ($self) = @_;
1626 1607
1627 for (@{ $self->{children} }) { 1608 my (@w, @h);
1628 for (@{ $_ || [] }) { 1609
1629 $_ = 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];
1630 } 1620 }
1631 } 1621 }
1632}
1633 1622
1634# TODO: move to container class maybe? send children a signal on removal? 1623 # second pass, rows
1635sub clear { 1624 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)}; 1625 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1662 1626
1663 $w[$x] = max $w[$x], $w; 1627 my $sh = sum @h[$r .. $r + $rs - 1];
1664 $h[$y] = max $h[$y], $h; 1628
1629 if ($h > $sh) {
1630 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1665 } 1631 }
1666 } 1632 }
1667 1633
1668 (\@w, \@h) 1634 (\@w, \@h)
1669} 1635}
… …
1685 my ($ws, $hs) = $self->get_wh; 1651 my ($ws, $hs) = $self->get_wh;
1686 1652
1687 my $req_w = (sum @$ws) || 1; 1653 my $req_w = (sum @$ws) || 1;
1688 my $req_h = (sum @$hs) || 1; 1654 my $req_h = (sum @$hs) || 1;
1689 1655
1690 # TODO: nicer code 1656 # now linearly scale the rows/columns to the allocated size
1691 my @col_expand = @{$self->{col_expand}}; 1657 my @col_expand = @{$self->{col_expand}};
1692 @col_expand = (1) x @$ws unless @col_expand; 1658 @col_expand = (1) x @$ws unless @col_expand;
1693 my $col_expand = (sum @col_expand) || 1; 1659 my $col_expand = (sum @col_expand) || 1;
1694 1660
1695 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1661 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1702 1668
1703 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1669 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1704 1670
1705 CFPlus::UI::harmonize $hs; 1671 CFPlus::UI::harmonize $hs;
1706 1672
1707 my $y; 1673 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1674 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1708 1675
1709 for my $r (0 .. $#{$self->{children}}) { 1676 for my $widget ($self->children) {
1710 my $row = $self->{children}[$r] 1677 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1711 or next;
1712 1678
1713 my $x = 0; 1679 $widget->configure (
1714 my $row_h = $hs->[$r]; 1680 $x[$c], $y[$r],
1681 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1715 1682 );
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 } 1683 }
1728 1684
1729 1 1685 1
1730} 1686}
1731 1687
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############################################################################# 1688#############################################################################
1757 1689
1758package CFPlus::UI::Fixed; 1690package CFPlus::UI::Fixed;
1759 1691
1760use List::Util qw(min max); 1692use List::Util qw(min max);
1761 1693
1762our @ISA = CFPlus::UI::Container::; 1694our @ISA = CFPlus::UI::Container::;
1763 1695
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($$$) { 1696sub _scale($$$) {
1772 my ($mode, $val, $max) = @_; 1697 my ($rel, $val, $max) = @_;
1773 1698
1774 $mode eq "abs" ? $val 1699 $rel ? $val * $max : $val
1775 : $mode eq "rel" ? $val * $max
1776 : 0
1777} 1700}
1778 1701
1779sub size_request { 1702sub size_request {
1780 my ($self) = @_; 1703 my ($self) = @_;
1781 1704
1782 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1705 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1783 1706
1784 # determine overall size by querying abs widgets 1707 # determine overall size by querying abs widgets
1785 for my $child ($self->visible_children) { 1708 for my $child ($self->visible_children) {
1786 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};
1787 1712
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; 1713 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1793 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1714 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1794 } 1715 }
1795 } 1716 }
1796 1717
1797 my $W = $x2 - $x1; 1718 my $W = $x2 - $x1;
1798 my $H = $y2 - $y1; 1719 my $H = $y2 - $y1;
1799 1720
1800 # now layout remaining widgets 1721 # now layout remaining widgets
1801 for my $child ($self->visible_children) { 1722 for my $child ($self->visible_children) {
1802 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;
1803 1726
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; 1727 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1811 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1728 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1812 } 1729 }
1813 } 1730 }
1814 1731
1815 my $W = $x2 - $x1; 1732 my $W = $x2 - $x1;
1816 my $H = $y2 - $y1; 1733 my $H = $y2 - $y1;
… …
1820 1737
1821sub invoke_size_allocate { 1738sub invoke_size_allocate {
1822 my ($self, $W, $H) = @_; 1739 my ($self, $W, $H) = @_;
1823 1740
1824 for my $child ($self->visible_children) { 1741 for my $child ($self->visible_children) {
1825 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;
1826 1744
1827 $x = _scale $pos, $x, $W; 1745 $x += $child->{c_halign} * $child->{req_w};
1828 $y = _scale $pos, $x, $H; 1746 $y += $child->{c_valign} * $child->{req_h};
1829 $w = _scale $size, $w, $child->{req_w};
1830 $h = _scale $size, $h, $child->{req_h};
1831 1747
1832 $child->configure ($x, $y, $w, $h); 1748 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1833 } 1749 }
1834 1750
1835 1 1751 1
1836} 1752}
1837 1753
… …
1841 1757
1842our @ISA = CFPlus::UI::Container::; 1758our @ISA = CFPlus::UI::Container::;
1843 1759
1844sub size_request { 1760sub size_request {
1845 my ($self) = @_; 1761 my ($self) = @_;
1762
1763 my @children = $self->visible_children;
1846 1764
1847 $self->{vertical} 1765 $self->{vertical}
1848 ? ( 1766 ? (
1849 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1767 (List::Util::max map $_->{req_w}, @children),
1850 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1768 (List::Util::sum map $_->{req_h}, @children),
1851 ) 1769 )
1852 : ( 1770 : (
1853 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1771 (List::Util::sum map $_->{req_w}, @children),
1854 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1772 (List::Util::max map $_->{req_h}, @children),
1855 ) 1773 )
1856} 1774}
1857 1775
1858sub invoke_size_allocate { 1776sub invoke_size_allocate {
1859 my ($self, $w, $h) = @_; 1777 my ($self, $w, $h) = @_;
… …
2100 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2018 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2101 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2019 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2102 : ($self->{h} - $size->[1]) * 0.5); 2020 : ($self->{h} - $size->[1]) * 0.5);
2103 }; 2021 };
2104 2022
2105 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2023# unless ($self->{list}) {
2106 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};
2107 2031
2108 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2032 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2109} 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#}
2110 2042
2111############################################################################# 2043#############################################################################
2112 2044
2113package CFPlus::UI::EntryBase; 2045package CFPlus::UI::EntryBase;
2114 2046
… …
2899 2831
2900 $self->SUPER::invoke_button_down ($ev, $x, $y); 2832 $self->SUPER::invoke_button_down ($ev, $x, $y);
2901 2833
2902 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2834 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2903 2835
2904 $self->invoke_mouse_motion ($ev, $x, $y) 2836 $self->invoke_mouse_motion ($ev, $x, $y);
2837
2838 1
2905} 2839}
2906 2840
2907sub invoke_mouse_motion { 2841sub invoke_mouse_motion {
2908 my ($self, $ev, $x, $y) = @_; 2842 my ($self, $ev, $x, $y) = @_;
2909 2843
… …
2929 2863
2930 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 2864 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2931 2865
2932 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 2866 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2933 2867
2934 ! ! $delta 2868 1
2935} 2869}
2936 2870
2937sub update { 2871sub update {
2938 my ($self) = @_; 2872 my ($self) = @_;
2939 2873
… …
3070} 3004}
3071 3005
3072sub size_request { 3006sub size_request {
3073 my ($self) = @_; 3007 my ($self) = @_;
3074 3008
3075 my ($empty, $slider) = @{ $self->{children} }; 3009 my ($empty, $slider) = $self->visible_children;
3076 3010
3077 local $self->{children} = [$empty, $slider]; 3011 local $self->{children} = [$empty, $slider];
3078 $self->SUPER::size_request 3012 $self->SUPER::size_request
3079} 3013}
3080 3014
… …
3512 3446
3513 if ($self->{anim} && $self->{animspeed}) { 3447 if ($self->{anim} && $self->{animspeed}) {
3514 CFPlus::weaken (my $widget = $self); 3448 CFPlus::weaken (my $widget = $self);
3515 3449
3516 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3450 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3517 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3451 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3518 $self->{timer} = Event->timer ( 3452 $self->{timer} = Event->timer (
3519 parked => 1, 3453 parked => 1,
3520 cb => sub { 3454 cb => sub {
3521 return unless $::CONN && $widget; 3455 return unless $::CONN && $widget;
3522 3456
… …
3559 3493
3560 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3494 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3561 if ($anim && @$anim) { 3495 if ($anim && @$anim) {
3562 delete $self->{wait_face}; 3496 delete $self->{wait_face};
3563 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3497 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3498 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3564 } 3499 }
3565 } 3500 }
3566} 3501}
3567 3502
3568sub size_request { 3503sub size_request {
3569 my ($self) = @_; 3504 my ($self) = @_;
3570 3505
3571 if ($::CONN) { 3506 if ($::CONN) {
3572 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3507 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3573 if (my $tex = $::CONN->{texture}[$faceid]) { 3508 if (my $tex = $::CONN->{texture}[$faceid]) {
3509 $self->{tex} = $tex;
3574 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3510 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3575 } else { 3511 } else {
3576 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3512 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3577 $self->realloc; 3513 $self->realloc;
3578 }); 3514 });
… …
3600} 3536}
3601 3537
3602sub _draw { 3538sub _draw {
3603 my ($self) = @_; 3539 my ($self) = @_;
3604 3540
3605 return unless $::CONN;
3606
3607 $self->SUPER::_draw; 3541 $self->SUPER::_draw;
3608 3542
3609 my $faceid = $::CONN->{faceid}[$self->{face}] 3543 if (my $tex = $self->{tex}) {
3610 or return;
3611
3612 my $tex = $::CONN->{texture}[$faceid];
3613
3614 if ($tex) {
3615 glEnable GL_TEXTURE_2D; 3544 glEnable GL_TEXTURE_2D;
3616 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3545 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3617 glColor 0, 0, 0, 1; 3546 glColor 0, 0, 0, 1;
3618 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3547 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3619 glDisable GL_TEXTURE_2D; 3548 glDisable GL_TEXTURE_2D;
… …
3821 ); 3750 );
3822 3751
3823 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3752 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3824 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3753 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3825 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
3826 $self 3789 $self
3827} 3790}
3828 3791
3829sub 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 {
3830 my ($self, $title, $widget, $tooltip) = @_; 3805 my ($self, $title, $widget, $tooltip) = @_;
3831 3806
3832 CFPlus::weaken $self; 3807 $title = [$title, $tooltip] unless ref $title;
3808 $widget->{c_tab} = $title;
3833 3809
3834 $self->{buttonbar}->add (new CFPlus::UI::Button
3835 markup => $title,
3836 tooltip => $tooltip,
3837 on_activate => sub { $self->set_current_page ($widget) },
3838 );
3839
3840 $self->{multiplexer}->add ($widget); 3810 $self->add ($widget);
3841} 3811}
3842 3812
3843sub get_current_page { 3813sub get_current_page {
3844 my ($self) = @_; 3814 my ($self) = @_;
3845 3815
… …
4175 while ($self->{refresh_hook}) { 4145 while ($self->{refresh_hook}) {
4176 $_->() 4146 $_->()
4177 for values %{delete $self->{refresh_hook}}; 4147 for values %{delete $self->{refresh_hook}};
4178 } 4148 }
4179 4149
4180 if ($self->{realloc}) { 4150 while ($self->{realloc}) {
4181 my %queue; 4151 my %queue;
4182 my @queue; 4152 my @queue;
4183 my $widget; 4153 my $widget;
4184 4154
4185 outer: 4155 outer:
… …
4232 } 4202 }
4233 } 4203 }
4234 4204
4235 delete $self->{realloc}{$widget+0}; 4205 delete $self->{realloc}{$widget+0};
4236 } 4206 }
4237 }
4238 4207
4239 while (my $size_alloc = delete $self->{size_alloc}) { 4208 while (my $size_alloc = delete $self->{size_alloc}) {
4240 my @queue = sort { $b->{visible} <=> $a->{visible} } 4209 my @queue = sort { $a->{visible} <=> $b->{visible} }
4241 values %$size_alloc; 4210 values %$size_alloc;
4242 4211
4243 while () { 4212 while () {
4244 my $widget = pop @queue || last; 4213 my $widget = pop @queue || last;
4245 4214
4246 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4215 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4247 4216
4248 $w = 0 if $w < 0;
4249 $h = 0 if $h < 0;
4250
4251 $w = max $widget->{min_w}, $w; 4217 $w = max $widget->{min_w}, $w;
4252 $h = max $widget->{min_h}, $h; 4218 $h = max $widget->{min_h}, $h;
4253 4219
4254# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4220# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4255# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4221# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4256 4222
4257 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4223 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4258 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4224 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4259 4225
4260 $w = int $w + 0.5; 4226 $w = int $w + 0.5;
4261 $h = int $h + 0.5; 4227 $h = int $h + 0.5;
4262 4228
4263 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}) {
4264 $widget->{old_w} = $widget->{w}; 4230 $widget->{old_w} = $widget->{w};
4265 $widget->{old_h} = $widget->{h}; 4231 $widget->{old_h} = $widget->{h};
4266 4232
4267 $widget->{w} = $w; 4233 $widget->{w} = $w;
4268 $widget->{h} = $h; 4234 $widget->{h} = $h;
4269 4235
4270 $widget->emit (size_allocate => $w, $h); 4236 $widget->emit (size_allocate => $w, $h);
4237 }
4271 } 4238 }
4272 } 4239 }
4273 } 4240 }
4274 4241
4275 while ($self->{post_alloc_hook}) { 4242 while ($self->{post_alloc_hook}) {

Diff Legend

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