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.400 by root, Sat Jul 21 16:15:03 2007 UTC vs.
Revision 1.420 by root, Wed Jul 25 15:50:17 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";
… …
769 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
770 ]; 726 ];
771 727
772 $self->realloc; 728 $self->realloc;
773 729
730 $self->emit (c_add => \@widgets);
731
774 map $_+0, @widgets 732 map $_+0, @widgets
775} 733}
776 734
777sub children { 735sub children {
778 @{ $_[0]{children} } 736 @{ $_[0]{children} }
779} 737}
780 738
781sub remove { 739sub remove {
782 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
783 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
784 delete $child->{parent}; 745 delete $child->{parent};
785 $child->hide; 746 $child->hide;
786
787 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
788 749
789 $self->realloc; 750 $self->realloc;
790} 751}
791 752
792sub clear { 753sub clear {
… …
820} 781}
821 782
822sub _draw { 783sub _draw {
823 my ($self) = @_; 784 my ($self) = @_;
824 785
825 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
826} 787}
827 788
828############################################################################# 789#############################################################################
829 790
830package CFPlus::UI::Bin; 791package CFPlus::UI::Bin;
… …
840} 801}
841 802
842sub add { 803sub add {
843 my ($self, $child) = @_; 804 my ($self, $child) = @_;
844 805
845 $self->SUPER::remove ($_) for @{ $self->{children} }; 806 $self->clear;
846 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
847} 808}
848 809
849sub remove { 810sub remove {
850 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
… …
992 $self->{view_x} = $x; 953 $self->{view_x} = $x;
993 $self->{view_y} = $y; 954 $self->{view_y} = $y;
994 955
995 $self->emit (changed => $x, $y); 956 $self->emit (changed => $x, $y);
996 $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);
997 } 976 }
998} 977}
999 978
1000# 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
1001sub coord2local { 980sub coord2local {
… …
1094 $vp->{parent}{hslider}->set_value ($x); 1073 $vp->{parent}{hslider}->set_value ($x);
1095 $vp->{parent}{vslider}->set_value ($y); 1074 $vp->{parent}{vslider}->set_value ($y);
1096 1075
1097 0 1076 0
1098 }, 1077 },
1078 on_size_allocate => sub {
1079 my ($vp, $w, $h) = @_;
1080 $vp->{parent}->update_slider;
1081 0
1082 },
1099 ; 1083 ;
1100 1084
1101 $self->SUPER::add ($self->{vp}); 1085 $self->SUPER::add ($self->{vp});
1102 1086
1103 $self->add ($child) if $child; 1087 $self->add ($child) if $child;
… …
1109 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
1110 1094
1111 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
1112} 1096}
1113 1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1101
1114sub update_slider { 1102sub update_slider {
1115 my ($self) = @_; 1103 my ($self) = @_;
1116 1104
1117 my $child = ($self->{vp} or return)->child; 1105 my $child = ($self->{vp} or return)->child;
1118 1106
1107 if ($self->{scroll_x}) {
1119 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1108 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1120 $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]);
1121 1110
1122 my $visible = $w1 > $w2; 1111 my $visible = $w1 > $w2;
1123 if ($visible != $self->{hslider_visible}) { 1112 if ($visible != $self->{hslider_visible}) {
1124 $self->{hslider_visible} = $visible; 1113 $self->{hslider_visible} = $visible;
1125 $visible ? $self->SUPER::add ($self->{hslider}) 1114 $visible ? $self->SUPER::add ($self->{hslider})
1126 : $self->SUPER::remove ($self->{hslider}); 1115 : $self->SUPER::remove ($self->{hslider});
1116 }
1127 } 1117 }
1128 1118
1119 if ($self->{scroll_y}) {
1129 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1120 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1130 $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]);
1131 1122
1132 my $visible = $h1 > $h2; 1123 my $visible = $h1 > $h2;
1133 if ($visible != $self->{vslider_visible}) { 1124 if ($visible != $self->{vslider_visible}) {
1134 $self->{vslider_visible} = $visible; 1125 $self->{vslider_visible} = $visible;
1135 $visible ? $self->SUPER::add ($self->{vslider}) 1126 $visible ? $self->SUPER::add ($self->{vslider})
1136 : $self->SUPER::remove ($self->{vslider}); 1127 : $self->SUPER::remove ($self->{vslider});
1128 }
1137 } 1129 }
1138} 1130}
1139 1131
1140sub start_dragging { 1132sub start_dragging {
1141 my ($self, $ev) = @_; 1133 my ($self, $ev) = @_;
… …
1721 1713
1722use List::Util qw(min max); 1714use List::Util qw(min max);
1723 1715
1724our @ISA = CFPlus::UI::Container::; 1716our @ISA = CFPlus::UI::Container::;
1725 1717
1726sub add {
1727 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1728
1729 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1730 $self->SUPER::add ($child);
1731}
1732
1733sub _scale($$$) { 1718sub _scale($$$) {
1734 my ($mode, $val, $max) = @_; 1719 my ($rel, $val, $max) = @_;
1735 1720
1736 $mode eq "abs" ? $val 1721 $rel ? $val * $max : $val
1737 : $mode eq "rel" ? $val * $max
1738 : 0
1739} 1722}
1740 1723
1741sub size_request { 1724sub size_request {
1742 my ($self) = @_; 1725 my ($self) = @_;
1743 1726
1744 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1745 1728
1746 # determine overall size by querying abs widgets 1729 # determine overall size by querying abs widgets
1747 for my $child ($self->visible_children) { 1730 for my $child ($self->visible_children) {
1748 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};
1749 1734
1750 if ($pos eq "abs") {
1751 $w = _scale $size, $w, $child->{req_w};
1752 $h = _scale $size, $h, $child->{req_h};
1753
1754 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1755 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1756 } 1737 }
1757 } 1738 }
1758 1739
1759 my $W = $x2 - $x1; 1740 my $W = $x2 - $x1;
1760 my $H = $y2 - $y1; 1741 my $H = $y2 - $y1;
1761 1742
1762 # now layout remaining widgets 1743 # now layout remaining widgets
1763 for my $child ($self->visible_children) { 1744 for my $child ($self->visible_children) {
1764 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;
1765 1748
1766 if ($pos ne "abs") {
1767 $x = _scale $pos, $x, $W;
1768 $y = _scale $pos, $x, $H;
1769 $w = _scale $size, $w, $child->{req_w};
1770 $h = _scale $size, $h, $child->{req_h};
1771
1772 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1773 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1774 } 1751 }
1775 } 1752 }
1776 1753
1777 my $W = $x2 - $x1; 1754 my $W = $x2 - $x1;
1778 my $H = $y2 - $y1; 1755 my $H = $y2 - $y1;
… …
1782 1759
1783sub invoke_size_allocate { 1760sub invoke_size_allocate {
1784 my ($self, $W, $H) = @_; 1761 my ($self, $W, $H) = @_;
1785 1762
1786 for my $child ($self->visible_children) { 1763 for my $child ($self->visible_children) {
1787 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;
1788 1766
1789 $x = _scale $pos, $x, $W; 1767 $x += $child->{c_halign} * $child->{req_w};
1790 $y = _scale $pos, $x, $H; 1768 $y += $child->{c_valign} * $child->{req_h};
1791 $w = _scale $size, $w, $child->{req_w};
1792 $h = _scale $size, $h, $child->{req_h};
1793 1769
1794 $child->configure ($x, $y, $w, $h); 1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1795 } 1771 }
1796 1772
1797 1 1773 1
1798} 1774}
1799 1775
… …
1803 1779
1804our @ISA = CFPlus::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1805 1781
1806sub size_request { 1782sub size_request {
1807 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1808 1786
1809 $self->{vertical} 1787 $self->{vertical}
1810 ? ( 1788 ? (
1811 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1812 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1813 ) 1791 )
1814 : ( 1792 : (
1815 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1816 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1817 ) 1795 )
1818} 1796}
1819 1797
1820sub invoke_size_allocate { 1798sub invoke_size_allocate {
1821 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
… …
2062 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2040 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2063 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2041 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2064 : ($self->{h} - $size->[1]) * 0.5); 2042 : ($self->{h} - $size->[1]) * 0.5);
2065 }; 2043 };
2066 2044
2067 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2045# unless ($self->{list}) {
2068 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2046# $self->{list} = CFPlus::OpenGL::glGenList;
2047# CFPlus::OpenGL::glNewList $self->{list};
2048# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2049# CFPlus::OpenGL::glEndList;
2050# }
2051#
2052# CFPlus::OpenGL::glCallList $self->{list};
2069 2053
2070 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2054 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2071} 2055}
2056
2057#sub destroy {
2058# my ($self) = @_;
2059#
2060# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2061#
2062# $self->SUPER::destroy;
2063#}
2072 2064
2073############################################################################# 2065#############################################################################
2074 2066
2075package CFPlus::UI::EntryBase; 2067package CFPlus::UI::EntryBase;
2076 2068
… …
2082 my $class = shift; 2074 my $class = shift;
2083 2075
2084 $class->SUPER::new ( 2076 $class->SUPER::new (
2085 fg => [1, 1, 1], 2077 fg => [1, 1, 1],
2086 bg => [0, 0, 0, 0.2], 2078 bg => [0, 0, 0, 0.2],
2079 outline => [0.6, 0.3, 0.1],
2087 active_bg => [1, 1, 1, 0.5], 2080 active_bg => [0, 0, 1, .2],
2088 active_fg => [0, 0, 0], 2081 active_fg => [1, 1, 1],
2082 active_outline => [1, 1, 0],
2089 can_hover => 1, 2083 can_hover => 1,
2090 can_focus => 1, 2084 can_focus => 1,
2091 valign => 0, 2085 valign => 0,
2092 can_events => 1, 2086 can_events => 1,
2093 ellipsise => 0, 2087 ellipsise => 0,
… …
2250 2244
2251 unless (exists $self->{cur_h}) { 2245 unless (exists $self->{cur_h}) {
2252 my $text = substr $self->{text}, 0, $self->{cursor}; 2246 my $text = substr $self->{text}, 0, $self->{cursor};
2253 utf8::encode $text; 2247 utf8::encode $text;
2254 2248
2255 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2249 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2256 } 2250 }
2257 2251
2252 glColor_premultiply @{$self->{active_fg}};
2258 glBegin GL_LINES; 2253 glBegin GL_LINES;
2259 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2254 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} + $self->{cur_h}; 2255 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2256 glEnd;
2257
2258 glLineWidth 3;
2259 glColor @{$self->{active_outline}};
2260 glBegin GL_LINE_LOOP;
2261 glVertex 0, 0;
2262 glVertex $self->{w} - 1, 0;
2263 glVertex $self->{w} - 1, $self->{h} - 1;
2264 glVertex 0, $self->{h} - 1;
2265 glEnd;
2266 glLineWidth 1;
2267
2268 } else {
2269 glColor @{$self->{outline}};
2270 glTranslate .375, .375;
2271 glBegin GL_LINE_STRIP;
2272 glVertex 0, $self->{h} * .5;
2273 glVertex 0, $self->{h} - 3;
2274 glVertex $self->{w} - 1, $self->{h} - 3;
2275 glVertex $self->{w} - 1, $self->{h} * .5;
2261 glEnd; 2276 glEnd;
2262 } 2277 }
2263} 2278}
2264 2279
2265############################################################################# 2280#############################################################################
… …
2352 1 2367 1
2353} 2368}
2354 2369
2355############################################################################# 2370#############################################################################
2356 2371
2372package CFPlus::UI::ButtonBin;
2373
2374our @ISA = CFPlus::UI::Bin::;
2375
2376use CFPlus::OpenGL;
2377
2378my @tex =
2379 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2380 qw(b1_button_inactive.png b1_button_active.png);
2381
2382sub new {
2383 my $class = shift;
2384
2385 $class->SUPER::new (
2386 can_hover => 1,
2387 align => 0,
2388 valign => 0,
2389 can_events => 1,
2390 @_
2391 )
2392}
2393
2394sub invoke_button_up {
2395 my ($self, $ev, $x, $y) = @_;
2396
2397 $self->emit ("activate")
2398 if $x >= 0 && $x < $self->{w}
2399 && $y >= 0 && $y < $self->{h};
2400
2401 1
2402}
2403
2404sub _draw {
2405 my ($self) = @_;
2406
2407 glEnable GL_TEXTURE_2D;
2408 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2409 glColor 0, 0, 0, 1;
2410
2411 my $tex = $tex[$GRAB == $self];
2412 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2413
2414 glDisable GL_TEXTURE_2D;
2415
2416 $self->SUPER::_draw;
2417}
2418
2419#############################################################################
2420
2357package CFPlus::UI::Button; 2421package CFPlus::UI::Button;
2358 2422
2359our @ISA = CFPlus::UI::Label::; 2423our @ISA = CFPlus::UI::Label::;
2360 2424
2361use CFPlus::OpenGL; 2425use CFPlus::OpenGL;
… …
2495sub new { 2559sub new {
2496 my $class = shift; 2560 my $class = shift;
2497 2561
2498 my $self = $class->SUPER::new ( 2562 my $self = $class->SUPER::new (
2499 can_events => 0, 2563 can_events => 0,
2564 scale => 1,
2500 @_, 2565 @_,
2501 ); 2566 );
2502 2567
2503 $self->{path} || $self->{tex} 2568 $self->{path} || $self->{tex}
2504 or Carp::croak "'path' or 'tex' attributes required"; 2569 or Carp::croak "'path' or 'tex' attributes required";
… …
2529} 2594}
2530 2595
2531sub size_request { 2596sub size_request {
2532 my ($self) = @_; 2597 my ($self) = @_;
2533 2598
2534 ($self->{tex}{w}, $self->{tex}{h}) 2599 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2535} 2600}
2536 2601
2537sub _draw { 2602sub _draw {
2538 my ($self) = @_; 2603 my ($self) = @_;
2539 2604
… …
2549 } 2614 }
2550 2615
2551 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2552 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2553 2618
2554 $tex->draw_quad (0, 0, $w, $h); 2619 $tex->draw_quad_alpha (0, 0, $w, $h);
2555 2620
2556 glDisable GL_TEXTURE_2D; 2621 glDisable GL_TEXTURE_2D;
2557} 2622}
2558 2623
2559############################################################################# 2624#############################################################################
… …
2861 2926
2862 $self->SUPER::invoke_button_down ($ev, $x, $y); 2927 $self->SUPER::invoke_button_down ($ev, $x, $y);
2863 2928
2864 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2929 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2865 2930
2866 $self->invoke_mouse_motion ($ev, $x, $y) 2931 $self->invoke_mouse_motion ($ev, $x, $y);
2932
2933 1
2867} 2934}
2868 2935
2869sub invoke_mouse_motion { 2936sub invoke_mouse_motion {
2870 my ($self, $ev, $x, $y) = @_; 2937 my ($self, $ev, $x, $y) = @_;
2871 2938
… …
2891 2958
2892 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 2959 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2893 2960
2894 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 2961 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2895 2962
2896 ! ! $delta 2963 1
2897} 2964}
2898 2965
2899sub update { 2966sub update {
2900 my ($self) = @_; 2967 my ($self) = @_;
2901 2968
… …
3032} 3099}
3033 3100
3034sub size_request { 3101sub size_request {
3035 my ($self) = @_; 3102 my ($self) = @_;
3036 3103
3037 my ($empty, $slider) = @{ $self->{children} }; 3104 my ($empty, $slider) = $self->visible_children;
3038 3105
3039 local $self->{children} = [$empty, $slider]; 3106 local $self->{children} = [$empty, $slider];
3040 $self->SUPER::size_request 3107 $self->SUPER::size_request
3041} 3108}
3042 3109
… …
3431 glTranslate 0.375, 0.375; 3498 glTranslate 0.375, 0.375;
3432 3499
3433 my ($w, $h) = @$self{qw(w h)}; 3500 my ($w, $h) = @$self{qw(w h)};
3434 3501
3435 glColor 1, 0.8, 0.4; 3502 glColor 1, 0.8, 0.4;
3436 glBegin GL_QUADS; 3503 glRect 0, 0, $w, $h;
3437 glVertex 0 , 0;
3438 glVertex 0 , $h;
3439 glVertex $w, $h;
3440 glVertex $w, 0;
3441 glEnd;
3442 3504
3443 glColor 0, 0, 0; 3505 glColor 0, 0, 0;
3444 glBegin GL_LINE_LOOP; 3506 glBegin GL_LINE_LOOP;
3445 glVertex 0 , 0; 3507 glVertex 0 , 0;
3446 glVertex 0 , $h; 3508 glVertex 0 , $h;
… …
3474 3536
3475 if ($self->{anim} && $self->{animspeed}) { 3537 if ($self->{anim} && $self->{animspeed}) {
3476 CFPlus::weaken (my $widget = $self); 3538 CFPlus::weaken (my $widget = $self);
3477 3539
3478 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3540 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3479 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3541 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3480 $self->{timer} = Event->timer ( 3542 $self->{timer} = Event->timer (
3481 parked => 1, 3543 parked => 1,
3482 cb => sub { 3544 cb => sub {
3483 return unless $::CONN && $widget; 3545 return unless $::CONN && $widget;
3484 3546
… …
3521 3583
3522 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3584 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3523 if ($anim && @$anim) { 3585 if ($anim && @$anim) {
3524 delete $self->{wait_face}; 3586 delete $self->{wait_face};
3525 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3587 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3588 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3526 } 3589 }
3527 } 3590 }
3528} 3591}
3529 3592
3530sub size_request { 3593sub size_request {
3531 my ($self) = @_; 3594 my ($self) = @_;
3532 3595
3533 if ($::CONN) { 3596 if ($::CONN) {
3534 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3597 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3535 if (my $tex = $::CONN->{texture}[$faceid]) { 3598 if (my $tex = $::CONN->{texture}[$faceid]) {
3599 $self->{tex} = $tex;
3536 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3600 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3537 } else { 3601 } else {
3538 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3602 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3539 $self->realloc; 3603 $self->realloc;
3540 }); 3604 });
… …
3562} 3626}
3563 3627
3564sub _draw { 3628sub _draw {
3565 my ($self) = @_; 3629 my ($self) = @_;
3566 3630
3567 return unless $::CONN;
3568
3569 $self->SUPER::_draw; 3631 $self->SUPER::_draw;
3570 3632
3571 my $faceid = $::CONN->{faceid}[$self->{face}] 3633 if (my $tex = $self->{tex}) {
3572 or return;
3573
3574 my $tex = $::CONN->{texture}[$faceid];
3575
3576 if ($tex) {
3577 glEnable GL_TEXTURE_2D; 3634 glEnable GL_TEXTURE_2D;
3578 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3579 glColor 0, 0, 0, 1; 3636 glColor 0, 0, 0, 1;
3580 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3637 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3581 glDisable GL_TEXTURE_2D; 3638 glDisable GL_TEXTURE_2D;
… …
3633 children => [ 3690 children => [
3634 (new CFPlus::UI::Label markup => $left, expand => 1), 3691 (new CFPlus::UI::Label markup => $left, expand => 1),
3635 (new CFPlus::UI::Label markup => $right, align => +1), 3692 (new CFPlus::UI::Label markup => $right, align => +1),
3636 ], 3693 ],
3637 ; 3694 ;
3638 3695
3639 } else { 3696 } else {
3640 $widget = new CFPlus::UI::Label 3697 $widget = new CFPlus::UI::Label
3641 can_hover => 1, 3698 can_hover => 1,
3642 can_events => 1, 3699 can_events => 1,
3643 markup => $widget, 3700 markup => $widget,
… …
3779 buttonbar => (new CFPlus::UI::Buttonbar), 3836 buttonbar => (new CFPlus::UI::Buttonbar),
3780 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3837 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3781 # filter => # will be put between multiplexer and $self 3838 # filter => # will be put between multiplexer and $self
3782 @_, 3839 @_,
3783 ); 3840 );
3784 3841
3785 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3842 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3786 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3843 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3787 3844
3845 {
3846 Scalar::Util::weaken (my $wself = $self);
3847
3848 $self->{multiplexer}->connect (c_add => sub {
3849 my ($mplex, $widgets) = @_;
3850
3851 for my $child (@$widgets) {
3852 Scalar::Util::weaken $child;
3853 $child->{c_tab_} ||= do {
3854 my $tab =
3855 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3856 ? $child->{c_tab}
3857 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3858
3859 $tab->connect (activate => sub {
3860 $wself->set_current_page ($child);
3861 });
3862
3863 $tab
3864 };
3865
3866 $self->{buttonbar}->add ($child->{c_tab_});
3867 }
3868 });
3869
3870 $self->{multiplexer}->connect (c_remove => sub {
3871 my ($mplex, $widgets) = @_;
3872
3873 for my $child (@$widgets) {
3874 $wself->{buttonbar}->remove ($child->{c_tab_});
3875 }
3876 });
3877 }
3878
3788 $self 3879 $self
3789} 3880}
3790 3881
3791sub add { 3882sub add {
3883 my ($self, @widgets) = @_;
3884
3885 $self->{multiplexer}->add (@widgets)
3886}
3887
3888sub remove {
3889 my ($self, @widgets) = @_;
3890
3891 $self->{multiplexer}->remove (@widgets)
3892}
3893
3894sub pages {
3895 my ($self) = @_;
3896 $self->{multiplexer}->children
3897}
3898
3899sub add_tab {
3792 my ($self, $title, $widget, $tooltip) = @_; 3900 my ($self, $title, $widget, $tooltip) = @_;
3793 3901
3794 CFPlus::weaken $self; 3902 $title = [$title, $tooltip] unless ref $title;
3903 $widget->{c_tab} = $title;
3795 3904
3796 $self->{buttonbar}->add (new CFPlus::UI::Button
3797 markup => $title,
3798 tooltip => $tooltip,
3799 on_activate => sub { $self->set_current_page ($widget) },
3800 );
3801
3802 $self->{multiplexer}->add ($widget); 3905 $self->add ($widget);
3803} 3906}
3804 3907
3805sub get_current_page { 3908sub get_current_page {
3806 my ($self) = @_; 3909 my ($self) = @_;
3807 3910
… …
4137 while ($self->{refresh_hook}) { 4240 while ($self->{refresh_hook}) {
4138 $_->() 4241 $_->()
4139 for values %{delete $self->{refresh_hook}}; 4242 for values %{delete $self->{refresh_hook}};
4140 } 4243 }
4141 4244
4142 if ($self->{realloc}) { 4245 while ($self->{realloc}) {
4143 my %queue; 4246 my %queue;
4144 my @queue; 4247 my @queue;
4145 my $widget; 4248 my $widget;
4146 4249
4147 outer: 4250 outer:
… …
4194 } 4297 }
4195 } 4298 }
4196 4299
4197 delete $self->{realloc}{$widget+0}; 4300 delete $self->{realloc}{$widget+0};
4198 } 4301 }
4199 }
4200 4302
4201 while (my $size_alloc = delete $self->{size_alloc}) { 4303 while (my $size_alloc = delete $self->{size_alloc}) {
4202 my @queue = sort { $b->{visible} <=> $a->{visible} } 4304 my @queue = sort { $a->{visible} <=> $b->{visible} }
4203 values %$size_alloc; 4305 values %$size_alloc;
4204 4306
4205 while () { 4307 while () {
4206 my $widget = pop @queue || last; 4308 my $widget = pop @queue || last;
4207 4309
4208 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4310 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4209 4311
4210 $w = 0 if $w < 0;
4211 $h = 0 if $h < 0;
4212
4213 $w = max $widget->{min_w}, $w; 4312 $w = max $widget->{min_w}, $w;
4214 $h = max $widget->{min_h}, $h; 4313 $h = max $widget->{min_h}, $h;
4215 4314
4216# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4315# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4217# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4316# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4218 4317
4219 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4318 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4220 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4319 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4221 4320
4222 $w = int $w + 0.5; 4321 $w = int $w + 0.5;
4223 $h = int $h + 0.5; 4322 $h = int $h + 0.5;
4224 4323
4225 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4324 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4226 $widget->{old_w} = $widget->{w}; 4325 $widget->{old_w} = $widget->{w};
4227 $widget->{old_h} = $widget->{h}; 4326 $widget->{old_h} = $widget->{h};
4228 4327
4229 $widget->{w} = $w; 4328 $widget->{w} = $w;
4230 $widget->{h} = $h; 4329 $widget->{h} = $h;
4231 4330
4232 $widget->emit (size_allocate => $w, $h); 4331 $widget->emit (size_allocate => $w, $h);
4332 }
4233 } 4333 }
4234 } 4334 }
4235 } 4335 }
4236 4336
4237 while ($self->{post_alloc_hook}) { 4337 while ($self->{post_alloc_hook}) {

Diff Legend

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