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.396 by root, Sat Jul 21 14:00:02 2007 UTC vs.
Revision 1.425 by root, Fri Aug 10 04:02:13 2007 UTC

… …
273 $self->emit ("destroy"); 273 $self->emit ("destroy");
274 %$self = (); 274 %$self = ();
275} 275}
276 276
277sub TO_JSON { 277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} } 278 { __w_ => $_[0]{s_id} }
279} 279}
280 280
281sub show { 281sub show {
282 my ($self) = @_; 282 my ($self) = @_;
283 283
… …
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
… …
769 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
770 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
771 ]; 726 ];
772 727
773 $self->realloc; 728 $self->realloc;
729
730 $self->emit (c_add => \@widgets);
731
732 map $_+0, @widgets
774} 733}
775 734
776sub children { 735sub children {
777 @{ $_[0]{children} } 736 @{ $_[0]{children} }
778} 737}
779 738
780sub remove { 739sub remove {
781 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
782 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
783 delete $child->{parent}; 745 delete $child->{parent};
784 $child->hide; 746 $child->hide;
785
786 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
787 749
788 $self->realloc; 750 $self->realloc;
789} 751}
790 752
791sub clear { 753sub clear {
… …
819} 781}
820 782
821sub _draw { 783sub _draw {
822 my ($self) = @_; 784 my ($self) = @_;
823 785
824 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
825} 787}
826 788
827############################################################################# 789#############################################################################
828 790
829package CFPlus::UI::Bin; 791package CFPlus::UI::Bin;
… …
839} 801}
840 802
841sub add { 803sub add {
842 my ($self, $child) = @_; 804 my ($self, $child) = @_;
843 805
844 $self->SUPER::remove ($_) for @{ $self->{children} }; 806 $self->clear;
845 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
846} 808}
847 809
848sub remove { 810sub remove {
849 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
… …
991 $self->{view_x} = $x; 953 $self->{view_x} = $x;
992 $self->{view_y} = $y; 954 $self->{view_y} = $y;
993 955
994 $self->emit (changed => $x, $y); 956 $self->emit (changed => $x, $y);
995 $self->update; 957 $self->update;
958 }
959}
960
961sub set_center {
962 my ($self, $x, $y) = @_;
963
964 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
965}
966
967sub make_visible {
968 my ($self, $x, $y, $border) = @_;
969
970 if ( $x < $self->{view_x} + $self->{w} * $border
971 || $x > $self->{view_x} + $self->{w} * (1 - $border)
972 || $y < $self->{view_y} + $self->{h} * $border
973 || $y > $self->{view_y} + $self->{h} * (1 - $border)
974 ) {
975 $self->set_center ($x, $y);
996 } 976 }
997} 977}
998 978
999# hmm, this does not work for topleft of $self... but we should not ask for that 979# hmm, this does not work for topleft of $self... but we should not ask for that
1000sub coord2local { 980sub coord2local {
… …
1047 my $child = delete $arg{child}; 1027 my $child = delete $arg{child};
1048 1028
1049 my $self; 1029 my $self;
1050 1030
1051 my $hslider = new CFPlus::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1052 col => 0, 1032 c_col => 0,
1053 row => 1, 1033 c_row => 1,
1054 vertical => 0, 1034 vertical => 0,
1055 range => [0, 0, 1, 0.01], # HACK fix 1035 range => [0, 0, 1, 0.01], # HACK fix
1056 on_changed => sub { 1036 on_changed => sub {
1057 $self->{hpos} = $_[1]; 1037 $self->{hpos} = $_[1];
1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1059 }, 1039 },
1060 ; 1040 ;
1061 1041
1062 my $vslider = new CFPlus::UI::Slider 1042 my $vslider = new CFPlus::UI::Slider
1063 col => 1, 1043 c_col => 1,
1064 row => 0, 1044 c_row => 0,
1065 vertical => 1, 1045 vertical => 1,
1066 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
1067 on_changed => sub { 1047 on_changed => sub {
1068 $self->{vpos} = $_[1]; 1048 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1080 row_expand => [1, 0], 1060 row_expand => [1, 0],
1081 %arg, 1061 %arg,
1082 ); 1062 );
1083 1063
1084 $self->{vp} = new CFPlus::UI::ViewPort 1064 $self->{vp} = new CFPlus::UI::ViewPort
1085 col => 0, 1065 c_col => 0,
1086 row => 0, 1066 c_row => 0,
1087 expand => 1, 1067 expand => 1,
1088 scroll_x => $self->{scroll_x}, 1068 scroll_x => $self->{scroll_x},
1089 scroll_y => $self->{scroll_y}, 1069 scroll_y => $self->{scroll_y},
1090 on_changed => sub { 1070 on_changed => sub {
1091 my ($vp, $x, $y) = @_; 1071 my ($vp, $x, $y) = @_;
… …
1093 $vp->{parent}{hslider}->set_value ($x); 1073 $vp->{parent}{hslider}->set_value ($x);
1094 $vp->{parent}{vslider}->set_value ($y); 1074 $vp->{parent}{vslider}->set_value ($y);
1095 1075
1096 0 1076 0
1097 }, 1077 },
1078 on_size_allocate => sub {
1079 my ($vp, $w, $h) = @_;
1080 $vp->{parent}->update_slider;
1081 0
1082 },
1098 ; 1083 ;
1099 1084
1100 $self->SUPER::add ($self->{vp}); 1085 $self->SUPER::add ($self->{vp});
1101 1086
1102 $self->add ($child) if $child; 1087 $self->add ($child) if $child;
… …
1108 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
1109 1094
1110 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
1111} 1096}
1112 1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1101
1113sub update_slider { 1102sub update_slider {
1114 my ($self) = @_; 1103 my ($self) = @_;
1115 1104
1116 my $child = ($self->{vp} or return)->child; 1105 my $child = ($self->{vp} or return)->child;
1117 1106
1107 if ($self->{scroll_x}) {
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1108 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1109 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120 1110
1121 my $visible = $w1 > $w2; 1111 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider_visible}) { 1112 if ($visible != $self->{hslider_visible}) {
1123 $self->{hslider_visible} = $visible; 1113 $self->{hslider_visible} = $visible;
1124 $visible ? $self->SUPER::add ($self->{hslider}) 1114 $visible ? $self->SUPER::add ($self->{hslider})
1125 : $self->SUPER::remove ($self->{hslider}); 1115 : $self->SUPER::remove ($self->{hslider});
1116 }
1126 } 1117 }
1127 1118
1119 if ($self->{scroll_y}) {
1128 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1120 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1129 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1121 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1130 1122
1131 my $visible = $h1 > $h2; 1123 my $visible = $h1 > $h2;
1132 if ($visible != $self->{vslider_visible}) { 1124 if ($visible != $self->{vslider_visible}) {
1133 $self->{vslider_visible} = $visible; 1125 $self->{vslider_visible} = $visible;
1134 $visible ? $self->SUPER::add ($self->{vslider}) 1126 $visible ? $self->SUPER::add ($self->{vslider})
1135 : $self->SUPER::remove ($self->{vslider}); 1127 : $self->SUPER::remove ($self->{vslider});
1128 }
1136 } 1129 }
1137} 1130}
1138
1139 1131
1140sub start_dragging { 1132sub start_dragging {
1141 my ($self, $ev) = @_; 1133 my ($self, $ev) = @_;
1142 1134
1143 $self->grab_focus; 1135 $self->grab_focus;
… …
1156} 1148}
1157 1149
1158sub invoke_mouse_wheel { 1150sub invoke_mouse_wheel {
1159 my ($self, $ev) = @_; 1151 my ($self, $ev) = @_;
1160 1152
1161 $self->{vslider}->emit (mouse_wheel => $ev) 1153 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1162 if $ev->{dy};
1163
1164 $self->{hslider}->emit (mouse_wheel => $ev) 1154 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1165 if $ev->{dx};
1166 1155
1167 1 1156 1
1168} 1157}
1169 1158
1170sub invoke_button_down { 1159sub invoke_button_down {
1171 my ($self, $ev, $x, $y) = @_; 1160 my ($self, $ev, $x, $y) = @_;
1172 1161
1173 if ($ev->{button} == 2) { 1162 if ($ev->{button} == 2) {
1174 $self->start_dragging ($ev); 1163 $self->start_dragging ($ev);
1175
1176 return 1; 1164 return 1;
1177 } 1165 }
1178 1166
1179 0 1167 0
1180} 1168}
… …
1610 1598
1611sub add { 1599sub add {
1612 my ($self, @widgets) = @_; 1600 my ($self, @widgets) = @_;
1613 1601
1614 for my $child (@widgets) { 1602 for my $child (@widgets) {
1615 $child->{rowspan} ||= 1; 1603 $child->{c_rowspan} ||= 1;
1616 $child->{colspan} ||= 1; 1604 $child->{c_colspan} ||= 1;
1617 } 1605 }
1618 1606
1619 $self->SUPER::add (@widgets); 1607 $self->SUPER::add (@widgets);
1620} 1608}
1621 1609
… …
1625 my @widgets; 1613 my @widgets;
1626 1614
1627 while (@_) { 1615 while (@_) {
1628 my ($col, $row, $child) = splice @_, 0, 3, (); 1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1629 1617
1630 $child->{row} = $row; 1618 $child->{c_row} = $row;
1631 $child->{col} = $col; 1619 $child->{c_col} = $col;
1632 1620
1633 push @widgets, $child; 1621 push @widgets, $child;
1634 } 1622 }
1635 1623
1636 $self->add (@widgets); 1624 $self->add (@widgets);
… …
1642 my (@w, @h); 1630 my (@w, @h);
1643 1631
1644 my @children = $self->children; 1632 my @children = $self->children;
1645 1633
1646 # first pass, columns 1634 # first pass, columns
1647 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1635 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1648 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1636 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1649 1637
1650 my $sw = sum @w[$c .. $c + $cs - 1]; 1638 my $sw = sum @w[$c .. $c + $cs - 1];
1651 1639
1652 if ($w > $sw) { 1640 if ($w > $sw) {
1653 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1654 } 1642 }
1655 } 1643 }
1656 1644
1657 # second pass, rows 1645 # second pass, rows
1658 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1646 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1659 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1660 1648
1661 my $sh = sum @h[$r .. $r + $rs - 1]; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1662 1650
1663 if ($h > $sh) { 1651 if ($h > $sh) {
1664 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
… …
1706 1694
1707 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1708 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1709 1697
1710 for my $widget ($self->children) { 1698 for my $widget ($self->children) {
1711 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1712 1700
1713 $widget->configure ( 1701 $widget->configure (
1714 $x[$c], $y[$r], 1702 $x[$c], $y[$r],
1715 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1716 ); 1704 );
… …
1725 1713
1726use List::Util qw(min max); 1714use List::Util qw(min max);
1727 1715
1728our @ISA = CFPlus::UI::Container::; 1716our @ISA = CFPlus::UI::Container::;
1729 1717
1730sub add {
1731 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1732
1733 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1734 $self->SUPER::add ($child);
1735}
1736
1737sub _scale($$$) { 1718sub _scale($$$) {
1738 my ($mode, $val, $max) = @_; 1719 my ($rel, $val, $max) = @_;
1739 1720
1740 $mode eq "abs" ? $val 1721 $rel ? $val * $max : $val
1741 : $mode eq "rel" ? $val * $max
1742 : 0
1743} 1722}
1744 1723
1745sub size_request { 1724sub size_request {
1746 my ($self) = @_; 1725 my ($self) = @_;
1747 1726
1748 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1749 1728
1750 # determine overall size by querying abs widgets 1729 # determine overall size by querying abs widgets
1751 for my $child ($self->visible_children) { 1730 for my $child ($self->visible_children) {
1752 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1731 unless ($child->{c_rel}) {
1732 my $x = $child->{c_x};
1733 my $y = $child->{c_y};
1753 1734
1754 if ($pos eq "abs") {
1755 $w = _scale $size, $w, $child->{req_w};
1756 $h = _scale $size, $h, $child->{req_h};
1757
1758 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1759 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1760 } 1737 }
1761 } 1738 }
1762 1739
1763 my $W = $x2 - $x1; 1740 my $W = $x2 - $x1;
1764 my $H = $y2 - $y1; 1741 my $H = $y2 - $y1;
1765 1742
1766 # now layout remaining widgets 1743 # now layout remaining widgets
1767 for my $child ($self->visible_children) { 1744 for my $child ($self->visible_children) {
1768 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1745 if ($child->{c_rel}) {
1746 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1747 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1769 1748
1770 if ($pos ne "abs") {
1771 $x = _scale $pos, $x, $W;
1772 $y = _scale $pos, $x, $H;
1773 $w = _scale $size, $w, $child->{req_w};
1774 $h = _scale $size, $h, $child->{req_h};
1775
1776 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1777 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1778 } 1751 }
1779 } 1752 }
1780 1753
1781 my $W = $x2 - $x1; 1754 my $W = $x2 - $x1;
1782 my $H = $y2 - $y1; 1755 my $H = $y2 - $y1;
… …
1786 1759
1787sub invoke_size_allocate { 1760sub invoke_size_allocate {
1788 my ($self, $W, $H) = @_; 1761 my ($self, $W, $H) = @_;
1789 1762
1790 for my $child ($self->visible_children) { 1763 for my $child ($self->visible_children) {
1791 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1764 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1765 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1792 1766
1793 $x = _scale $pos, $x, $W; 1767 $x += $child->{c_halign} * $child->{req_w};
1794 $y = _scale $pos, $x, $H; 1768 $y += $child->{c_valign} * $child->{req_h};
1795 $w = _scale $size, $w, $child->{req_w};
1796 $h = _scale $size, $h, $child->{req_h};
1797 1769
1798 $child->configure ($x, $y, $w, $h); 1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1799 } 1771 }
1800 1772
1801 1 1773 1
1802} 1774}
1803 1775
… …
1807 1779
1808our @ISA = CFPlus::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1809 1781
1810sub size_request { 1782sub size_request {
1811 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1812 1786
1813 $self->{vertical} 1787 $self->{vertical}
1814 ? ( 1788 ? (
1815 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1816 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1817 ) 1791 )
1818 : ( 1792 : (
1819 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1820 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1821 ) 1795 )
1822} 1796}
1823 1797
1824sub invoke_size_allocate { 1798sub invoke_size_allocate {
1825 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
… …
1949 1923
1950 delete $self->{ox}; 1924 delete $self->{ox};
1951 $self->SUPER::realloc; 1925 $self->SUPER::realloc;
1952} 1926}
1953 1927
1928sub clear {
1929 my ($self) = @_;
1930
1931 $self->set_text ("");
1932}
1933
1954sub set_text { 1934sub set_text {
1955 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1956 1936
1957 return if $self->{text} eq "T$text"; 1937 return if $self->{text} eq "T$text";
1958 $self->{text} = "T$text"; 1938 $self->{text} = "T$text";
… …
2066 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2046 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2067 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2047 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2068 : ($self->{h} - $size->[1]) * 0.5); 2048 : ($self->{h} - $size->[1]) * 0.5);
2069 }; 2049 };
2070 2050
2071 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2051# unless ($self->{list}) {
2072 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2052# $self->{list} = CFPlus::OpenGL::glGenList;
2053# CFPlus::OpenGL::glNewList $self->{list};
2054# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2055# CFPlus::OpenGL::glEndList;
2056# }
2057#
2058# CFPlus::OpenGL::glCallList $self->{list};
2073 2059
2074 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2060 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2075} 2061}
2062
2063#sub destroy {
2064# my ($self) = @_;
2065#
2066# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2067#
2068# $self->SUPER::destroy;
2069#}
2076 2070
2077############################################################################# 2071#############################################################################
2078 2072
2079package CFPlus::UI::EntryBase; 2073package CFPlus::UI::EntryBase;
2080 2074
… …
2086 my $class = shift; 2080 my $class = shift;
2087 2081
2088 $class->SUPER::new ( 2082 $class->SUPER::new (
2089 fg => [1, 1, 1], 2083 fg => [1, 1, 1],
2090 bg => [0, 0, 0, 0.2], 2084 bg => [0, 0, 0, 0.2],
2085 outline => [0.6, 0.3, 0.1],
2091 active_bg => [1, 1, 1, 0.5], 2086 active_bg => [0, 0, 1, .2],
2092 active_fg => [0, 0, 0], 2087 active_fg => [1, 1, 1],
2088 active_outline => [1, 1, 0],
2093 can_hover => 1, 2089 can_hover => 1,
2094 can_focus => 1, 2090 can_focus => 1,
2095 valign => 0, 2091 valign => 0,
2096 can_events => 1, 2092 can_events => 1,
2097 ellipsise => 0, 2093 ellipsise => 0,
… …
2254 2250
2255 unless (exists $self->{cur_h}) { 2251 unless (exists $self->{cur_h}) {
2256 my $text = substr $self->{text}, 0, $self->{cursor}; 2252 my $text = substr $self->{text}, 0, $self->{cursor};
2257 utf8::encode $text; 2253 utf8::encode $text;
2258 2254
2259 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2255 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2260 } 2256 }
2261 2257
2258 glColor_premultiply @{$self->{active_fg}};
2262 glBegin GL_LINES; 2259 glBegin GL_LINES;
2263 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2260 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
2264 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2261 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2262 glEnd;
2263
2264 glLineWidth 3;
2265 glColor @{$self->{active_outline}};
2266 glBegin GL_LINE_LOOP;
2267 glVertex 0, 0;
2268 glVertex $self->{w} - 1, 0;
2269 glVertex $self->{w} - 1, $self->{h} - 1;
2270 glVertex 0, $self->{h} - 1;
2271 glEnd;
2272 glLineWidth 1;
2273
2274 } else {
2275 glColor @{$self->{outline}};
2276 glTranslate .375, .375;
2277 glBegin GL_LINE_STRIP;
2278 glVertex 0, $self->{h} * .5;
2279 glVertex 0, $self->{h} - 3;
2280 glVertex $self->{w} - 1, $self->{h} - 3;
2281 glVertex $self->{w} - 1, $self->{h} * .5;
2265 glEnd; 2282 glEnd;
2266 } 2283 }
2267} 2284}
2268 2285
2269############################################################################# 2286#############################################################################
… …
2356 1 2373 1
2357} 2374}
2358 2375
2359############################################################################# 2376#############################################################################
2360 2377
2378package CFPlus::UI::ButtonBin;
2379
2380our @ISA = CFPlus::UI::Bin::;
2381
2382use CFPlus::OpenGL;
2383
2384my @tex =
2385 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2386 qw(b1_button_inactive.png b1_button_active.png);
2387
2388sub new {
2389 my $class = shift;
2390
2391 $class->SUPER::new (
2392 can_hover => 1,
2393 align => 0,
2394 valign => 0,
2395 can_events => 1,
2396 @_
2397 )
2398}
2399
2400sub invoke_button_up {
2401 my ($self, $ev, $x, $y) = @_;
2402
2403 $self->emit ("activate")
2404 if $x >= 0 && $x < $self->{w}
2405 && $y >= 0 && $y < $self->{h};
2406
2407 1
2408}
2409
2410sub _draw {
2411 my ($self) = @_;
2412
2413 glEnable GL_TEXTURE_2D;
2414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2415 glColor 0, 0, 0, 1;
2416
2417 my $tex = $tex[$GRAB == $self];
2418 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2419
2420 glDisable GL_TEXTURE_2D;
2421
2422 $self->SUPER::_draw;
2423}
2424
2425#############################################################################
2426
2361package CFPlus::UI::Button; 2427package CFPlus::UI::Button;
2362 2428
2363our @ISA = CFPlus::UI::Label::; 2429our @ISA = CFPlus::UI::Label::;
2364 2430
2365use CFPlus::OpenGL; 2431use CFPlus::OpenGL;
… …
2499sub new { 2565sub new {
2500 my $class = shift; 2566 my $class = shift;
2501 2567
2502 my $self = $class->SUPER::new ( 2568 my $self = $class->SUPER::new (
2503 can_events => 0, 2569 can_events => 0,
2570 scale => 1,
2504 @_, 2571 @_,
2505 ); 2572 );
2506 2573
2507 $self->{path} || $self->{tex} 2574 $self->{path} || $self->{tex}
2508 or Carp::croak "'path' or 'tex' attributes required"; 2575 or Carp::croak "'path' or 'tex' attributes required";
… …
2533} 2600}
2534 2601
2535sub size_request { 2602sub size_request {
2536 my ($self) = @_; 2603 my ($self) = @_;
2537 2604
2538 ($self->{tex}{w}, $self->{tex}{h}) 2605 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2539} 2606}
2540 2607
2541sub _draw { 2608sub _draw {
2542 my ($self) = @_; 2609 my ($self) = @_;
2543 2610
… …
2553 } 2620 }
2554 2621
2555 glEnable GL_TEXTURE_2D; 2622 glEnable GL_TEXTURE_2D;
2556 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2623 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2557 2624
2558 $tex->draw_quad (0, 0, $w, $h); 2625 $tex->draw_quad_alpha (0, 0, $w, $h);
2559 2626
2560 glDisable GL_TEXTURE_2D; 2627 glDisable GL_TEXTURE_2D;
2561} 2628}
2562 2629
2563############################################################################# 2630#############################################################################
… …
2865 2932
2866 $self->SUPER::invoke_button_down ($ev, $x, $y); 2933 $self->SUPER::invoke_button_down ($ev, $x, $y);
2867 2934
2868 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2935 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2869 2936
2870 $self->invoke_mouse_motion ($ev, $x, $y) 2937 $self->invoke_mouse_motion ($ev, $x, $y);
2938
2939 1
2871} 2940}
2872 2941
2873sub invoke_mouse_motion { 2942sub invoke_mouse_motion {
2874 my ($self, $ev, $x, $y) = @_; 2943 my ($self, $ev, $x, $y) = @_;
2875 2944
… …
2895 2964
2896 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 2965 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2897 2966
2898 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 2967 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2899 2968
2900 ! ! $delta 2969 1
2901} 2970}
2902 2971
2903sub update { 2972sub update {
2904 my ($self) = @_; 2973 my ($self) = @_;
2905 2974
… …
3036} 3105}
3037 3106
3038sub size_request { 3107sub size_request {
3039 my ($self) = @_; 3108 my ($self) = @_;
3040 3109
3041 my ($empty, $slider) = @{ $self->{children} }; 3110 my ($empty, $slider) = $self->visible_children;
3042 3111
3043 local $self->{children} = [$empty, $slider]; 3112 local $self->{children} = [$empty, $slider];
3044 $self->SUPER::size_request 3113 $self->SUPER::size_request
3045} 3114}
3046 3115
… …
3435 glTranslate 0.375, 0.375; 3504 glTranslate 0.375, 0.375;
3436 3505
3437 my ($w, $h) = @$self{qw(w h)}; 3506 my ($w, $h) = @$self{qw(w h)};
3438 3507
3439 glColor 1, 0.8, 0.4; 3508 glColor 1, 0.8, 0.4;
3440 glBegin GL_QUADS; 3509 glRect 0, 0, $w, $h;
3441 glVertex 0 , 0;
3442 glVertex 0 , $h;
3443 glVertex $w, $h;
3444 glVertex $w, 0;
3445 glEnd;
3446 3510
3447 glColor 0, 0, 0; 3511 glColor 0, 0, 0;
3448 glBegin GL_LINE_LOOP; 3512 glBegin GL_LINE_LOOP;
3449 glVertex 0 , 0; 3513 glVertex 0 , 0;
3450 glVertex 0 , $h; 3514 glVertex 0 , $h;
… …
3478 3542
3479 if ($self->{anim} && $self->{animspeed}) { 3543 if ($self->{anim} && $self->{animspeed}) {
3480 CFPlus::weaken (my $widget = $self); 3544 CFPlus::weaken (my $widget = $self);
3481 3545
3482 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3546 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3483 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3547 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3484 $self->{timer} = Event->timer ( 3548 $self->{timer} = Event->timer (
3485 parked => 1, 3549 parked => 1,
3486 cb => sub { 3550 cb => sub {
3487 return unless $::CONN && $widget; 3551 return unless $::CONN && $widget;
3488 3552
… …
3525 3589
3526 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3590 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3527 if ($anim && @$anim) { 3591 if ($anim && @$anim) {
3528 delete $self->{wait_face}; 3592 delete $self->{wait_face};
3529 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3593 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3594 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]) {
3595 unless ($tex->{name} || $tex->{loading}) {
3596 $tex->upload (sub { $self->reconfigure });
3597 }
3598 }
3530 } 3599 }
3531 } 3600 }
3532} 3601}
3533 3602
3534sub size_request { 3603sub size_request {
3535 my ($self) = @_; 3604 my ($self) = @_;
3536 3605
3537 if ($::CONN) { 3606 if ($::CONN) {
3538 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3607 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3539 if (my $tex = $::CONN->{texture}[$faceid]) { 3608 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3609 if ($tex->{name}) {
3540 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3610 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3611 } elsif (!$tex->{loading}) {
3612 $tex->upload (sub { $self->reconfigure });
3613 }
3541 } else { 3614 } else {
3542 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3615 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3543 $self->realloc; 3616 $self->reconfigure;
3544 }); 3617 });
3545 } 3618 }
3546 } 3619 }
3547 } 3620 }
3548 3621
… …
3566} 3639}
3567 3640
3568sub _draw { 3641sub _draw {
3569 my ($self) = @_; 3642 my ($self) = @_;
3570 3643
3571 return unless $::CONN;
3572
3573 $self->SUPER::_draw; 3644 $self->SUPER::_draw;
3574 3645
3575 my $faceid = $::CONN->{faceid}[$self->{face}] 3646 if (my $tex = $self->{tex}) {
3576 or return;
3577
3578 my $tex = $::CONN->{texture}[$faceid];
3579
3580 if ($tex) {
3581 glEnable GL_TEXTURE_2D; 3647 glEnable GL_TEXTURE_2D;
3582 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3648 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3583 glColor 0, 0, 0, 1; 3649 glColor 0, 0, 0, 1;
3584 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3650 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3585 glDisable GL_TEXTURE_2D; 3651 glDisable GL_TEXTURE_2D;
… …
3637 children => [ 3703 children => [
3638 (new CFPlus::UI::Label markup => $left, expand => 1), 3704 (new CFPlus::UI::Label markup => $left, expand => 1),
3639 (new CFPlus::UI::Label markup => $right, align => +1), 3705 (new CFPlus::UI::Label markup => $right, align => +1),
3640 ], 3706 ],
3641 ; 3707 ;
3642 3708
3643 } else { 3709 } else {
3644 $widget = new CFPlus::UI::Label 3710 $widget = new CFPlus::UI::Label
3645 can_hover => 1, 3711 can_hover => 1,
3646 can_events => 1, 3712 can_events => 1,
3647 markup => $widget, 3713 markup => $widget,
… …
3783 buttonbar => (new CFPlus::UI::Buttonbar), 3849 buttonbar => (new CFPlus::UI::Buttonbar),
3784 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3850 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3785 # filter => # will be put between multiplexer and $self 3851 # filter => # will be put between multiplexer and $self
3786 @_, 3852 @_,
3787 ); 3853 );
3788 3854
3789 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3855 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3790 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3856 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3791 3857
3858 {
3859 Scalar::Util::weaken (my $wself = $self);
3860
3861 $self->{multiplexer}->connect (c_add => sub {
3862 my ($mplex, $widgets) = @_;
3863
3864 for my $child (@$widgets) {
3865 Scalar::Util::weaken $child;
3866 $child->{c_tab_} ||= do {
3867 my $tab =
3868 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3869 ? $child->{c_tab}
3870 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3871
3872 $tab->connect (activate => sub {
3873 $wself->set_current_page ($child);
3874 });
3875
3876 $tab
3877 };
3878
3879 $self->{buttonbar}->add ($child->{c_tab_});
3880 }
3881 });
3882
3883 $self->{multiplexer}->connect (c_remove => sub {
3884 my ($mplex, $widgets) = @_;
3885
3886 for my $child (@$widgets) {
3887 $wself->{buttonbar}->remove ($child->{c_tab_});
3888 }
3889 });
3890 }
3891
3792 $self 3892 $self
3793} 3893}
3794 3894
3795sub add { 3895sub add {
3896 my ($self, @widgets) = @_;
3897
3898 $self->{multiplexer}->add (@widgets)
3899}
3900
3901sub remove {
3902 my ($self, @widgets) = @_;
3903
3904 $self->{multiplexer}->remove (@widgets)
3905}
3906
3907sub pages {
3908 my ($self) = @_;
3909 $self->{multiplexer}->children
3910}
3911
3912sub add_tab {
3796 my ($self, $title, $widget, $tooltip) = @_; 3913 my ($self, $title, $widget, $tooltip) = @_;
3797 3914
3798 CFPlus::weaken $self; 3915 $title = [$title, $tooltip] unless ref $title;
3916 $widget->{c_tab} = $title;
3799 3917
3800 $self->{buttonbar}->add (new CFPlus::UI::Button
3801 markup => $title,
3802 tooltip => $tooltip,
3803 on_activate => sub { $self->set_current_page ($widget) },
3804 );
3805
3806 $self->{multiplexer}->add ($widget); 3918 $self->add ($widget);
3807} 3919}
3808 3920
3809sub get_current_page { 3921sub get_current_page {
3810 my ($self) = @_; 3922 my ($self) = @_;
3811 3923
… …
4094} 4206}
4095 4207
4096sub update { 4208sub update {
4097 my ($self) = @_; 4209 my ($self) = @_;
4098 4210
4099 $::WANT_REFRESH++; 4211 $::WANT_REFRESH->start;
4100} 4212}
4101 4213
4102sub add { 4214sub add {
4103 my ($self, @children) = @_; 4215 my ($self, @children) = @_;
4104 4216
… …
4141 while ($self->{refresh_hook}) { 4253 while ($self->{refresh_hook}) {
4142 $_->() 4254 $_->()
4143 for values %{delete $self->{refresh_hook}}; 4255 for values %{delete $self->{refresh_hook}};
4144 } 4256 }
4145 4257
4146 if ($self->{realloc}) { 4258 while ($self->{realloc}) {
4147 my %queue; 4259 my %queue;
4148 my @queue; 4260 my @queue;
4149 my $widget; 4261 my $widget;
4150 4262
4151 outer: 4263 outer:
… …
4198 } 4310 }
4199 } 4311 }
4200 4312
4201 delete $self->{realloc}{$widget+0}; 4313 delete $self->{realloc}{$widget+0};
4202 } 4314 }
4203 }
4204 4315
4205 while (my $size_alloc = delete $self->{size_alloc}) { 4316 while (my $size_alloc = delete $self->{size_alloc}) {
4206 my @queue = sort { $b->{visible} <=> $a->{visible} } 4317 my @queue = sort { $a->{visible} <=> $b->{visible} }
4207 values %$size_alloc; 4318 values %$size_alloc;
4208 4319
4209 while () { 4320 while () {
4210 my $widget = pop @queue || last; 4321 my $widget = pop @queue || last;
4211 4322
4212 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4323 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4213 4324
4214 $w = 0 if $w < 0;
4215 $h = 0 if $h < 0;
4216
4217 $w = max $widget->{min_w}, $w; 4325 $w = max $widget->{min_w}, $w;
4218 $h = max $widget->{min_h}, $h; 4326 $h = max $widget->{min_h}, $h;
4219 4327
4220# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4328# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4221# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4329# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4222 4330
4223 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4331 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4224 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4332 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4225 4333
4226 $w = int $w + 0.5; 4334 $w = int $w + 0.5;
4227 $h = int $h + 0.5; 4335 $h = int $h + 0.5;
4228 4336
4229 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4337 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4230 $widget->{old_w} = $widget->{w}; 4338 $widget->{old_w} = $widget->{w};
4231 $widget->{old_h} = $widget->{h}; 4339 $widget->{old_h} = $widget->{h};
4232 4340
4233 $widget->{w} = $w; 4341 $widget->{w} = $w;
4234 $widget->{h} = $h; 4342 $widget->{h} = $h;
4235 4343
4236 $widget->emit (size_allocate => $w, $h); 4344 $widget->emit (size_allocate => $w, $h);
4345 }
4237 } 4346 }
4238 } 4347 }
4239 } 4348 }
4240 4349
4241 while ($self->{post_alloc_hook}) { 4350 while ($self->{post_alloc_hook}) {

Diff Legend

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