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.398 by root, Sat Jul 21 14:32:10 2007 UTC vs.
Revision 1.418 by elmex, Tue Jul 24 18:39:39 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 {
… …
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 1131
1139sub start_dragging { 1132sub start_dragging {
1140 my ($self, $ev) = @_; 1133 my ($self, $ev) = @_;
… …
1720 1713
1721use List::Util qw(min max); 1714use List::Util qw(min max);
1722 1715
1723our @ISA = CFPlus::UI::Container::; 1716our @ISA = CFPlus::UI::Container::;
1724 1717
1725sub add {
1726 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1727
1728 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1729 $self->SUPER::add ($child);
1730}
1731
1732sub _scale($$$) { 1718sub _scale($$$) {
1733 my ($mode, $val, $max) = @_; 1719 my ($rel, $val, $max) = @_;
1734 1720
1735 $mode eq "abs" ? $val 1721 $rel ? $val * $max : $val
1736 : $mode eq "rel" ? $val * $max
1737 : 0
1738} 1722}
1739 1723
1740sub size_request { 1724sub size_request {
1741 my ($self) = @_; 1725 my ($self) = @_;
1742 1726
1743 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1744 1728
1745 # determine overall size by querying abs widgets 1729 # determine overall size by querying abs widgets
1746 for my $child ($self->visible_children) { 1730 for my $child ($self->visible_children) {
1747 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};
1748 1734
1749 if ($pos eq "abs") {
1750 $w = _scale $size, $w, $child->{req_w};
1751 $h = _scale $size, $h, $child->{req_h};
1752
1753 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1754 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1755 } 1737 }
1756 } 1738 }
1757 1739
1758 my $W = $x2 - $x1; 1740 my $W = $x2 - $x1;
1759 my $H = $y2 - $y1; 1741 my $H = $y2 - $y1;
1760 1742
1761 # now layout remaining widgets 1743 # now layout remaining widgets
1762 for my $child ($self->visible_children) { 1744 for my $child ($self->visible_children) {
1763 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;
1764 1748
1765 if ($pos ne "abs") {
1766 $x = _scale $pos, $x, $W;
1767 $y = _scale $pos, $x, $H;
1768 $w = _scale $size, $w, $child->{req_w};
1769 $h = _scale $size, $h, $child->{req_h};
1770
1771 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1772 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1773 } 1751 }
1774 } 1752 }
1775 1753
1776 my $W = $x2 - $x1; 1754 my $W = $x2 - $x1;
1777 my $H = $y2 - $y1; 1755 my $H = $y2 - $y1;
… …
1781 1759
1782sub invoke_size_allocate { 1760sub invoke_size_allocate {
1783 my ($self, $W, $H) = @_; 1761 my ($self, $W, $H) = @_;
1784 1762
1785 for my $child ($self->visible_children) { 1763 for my $child ($self->visible_children) {
1786 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;
1787 1766
1788 $x = _scale $pos, $x, $W; 1767 $x += $child->{c_halign} * $child->{req_w};
1789 $y = _scale $pos, $x, $H; 1768 $y += $child->{c_valign} * $child->{req_h};
1790 $w = _scale $size, $w, $child->{req_w};
1791 $h = _scale $size, $h, $child->{req_h};
1792 1769
1793 $child->configure ($x, $y, $w, $h); 1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1794 } 1771 }
1795 1772
1796 1 1773 1
1797} 1774}
1798 1775
… …
1802 1779
1803our @ISA = CFPlus::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1804 1781
1805sub size_request { 1782sub size_request {
1806 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1807 1786
1808 $self->{vertical} 1787 $self->{vertical}
1809 ? ( 1788 ? (
1810 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1811 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1812 ) 1791 )
1813 : ( 1792 : (
1814 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1815 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1816 ) 1795 )
1817} 1796}
1818 1797
1819sub invoke_size_allocate { 1798sub invoke_size_allocate {
1820 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
… …
2061 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2040 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2062 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2041 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2063 : ($self->{h} - $size->[1]) * 0.5); 2042 : ($self->{h} - $size->[1]) * 0.5);
2064 }; 2043 };
2065 2044
2066 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2045# unless ($self->{list}) {
2067 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};
2068 2053
2069 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2054 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2070} 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#}
2071 2064
2072############################################################################# 2065#############################################################################
2073 2066
2074package CFPlus::UI::EntryBase; 2067package CFPlus::UI::EntryBase;
2075 2068
… …
2081 my $class = shift; 2074 my $class = shift;
2082 2075
2083 $class->SUPER::new ( 2076 $class->SUPER::new (
2084 fg => [1, 1, 1], 2077 fg => [1, 1, 1],
2085 bg => [0, 0, 0, 0.2], 2078 bg => [0, 0, 0, 0.2],
2086 active_bg => [1, 1, 1, 0.5], 2079 active_bg => [0, 0, 1, .2],
2087 active_fg => [0, 0, 0], 2080 active_fg => [1, 1, 1],
2081 active_outline => [1, 1, 0],
2088 can_hover => 1, 2082 can_hover => 1,
2089 can_focus => 1, 2083 can_focus => 1,
2090 valign => 0, 2084 valign => 0,
2091 can_events => 1, 2085 can_events => 1,
2092 ellipsise => 0, 2086 ellipsise => 0,
… …
2249 2243
2250 unless (exists $self->{cur_h}) { 2244 unless (exists $self->{cur_h}) {
2251 my $text = substr $self->{text}, 0, $self->{cursor}; 2245 my $text = substr $self->{text}, 0, $self->{cursor};
2252 utf8::encode $text; 2246 utf8::encode $text;
2253 2247
2254 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2248 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2255 } 2249 }
2256 2250
2251 glColor_premultiply @{$self->{active_fg}};
2257 glBegin GL_LINES; 2252 glBegin GL_LINES;
2258 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2253 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
2259 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2254 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2260 glEnd; 2255 glEnd;
2256
2257 glLineWidth 3;
2258 glColor @{$self->{active_outline}};
2259 glTranslate -.375, -.375;
2260 glBegin GL_LINE_LOOP;
2261 glVertex 0, 0;
2262 glVertex $self->{w}, 0;
2263 glVertex $self->{w}, $self->{h};
2264 glVertex 0, $self->{h};
2265 glEnd;
2266 glLineWidth 1;
2261 } 2267 }
2262} 2268}
2263 2269
2264############################################################################# 2270#############################################################################
2265 2271
… …
2351 1 2357 1
2352} 2358}
2353 2359
2354############################################################################# 2360#############################################################################
2355 2361
2362package CFPlus::UI::ButtonBin;
2363
2364our @ISA = CFPlus::UI::Bin::;
2365
2366use CFPlus::OpenGL;
2367
2368my @tex =
2369 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2370 qw(b1_button_inactive.png b1_button_active.png);
2371
2372sub new {
2373 my $class = shift;
2374
2375 $class->SUPER::new (
2376 can_hover => 1,
2377 align => 0,
2378 valign => 0,
2379 can_events => 1,
2380 @_
2381 )
2382}
2383
2384sub invoke_button_up {
2385 my ($self, $ev, $x, $y) = @_;
2386
2387 $self->emit ("activate")
2388 if $x >= 0 && $x < $self->{w}
2389 && $y >= 0 && $y < $self->{h};
2390
2391 1
2392}
2393
2394sub _draw {
2395 my ($self) = @_;
2396
2397 glEnable GL_TEXTURE_2D;
2398 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2399 glColor 0, 0, 0, 1;
2400
2401 my $tex = $tex[$GRAB == $self];
2402 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2403
2404 glDisable GL_TEXTURE_2D;
2405
2406 $self->SUPER::_draw;
2407}
2408
2409#############################################################################
2410
2356package CFPlus::UI::Button; 2411package CFPlus::UI::Button;
2357 2412
2358our @ISA = CFPlus::UI::Label::; 2413our @ISA = CFPlus::UI::Label::;
2359 2414
2360use CFPlus::OpenGL; 2415use CFPlus::OpenGL;
… …
2494sub new { 2549sub new {
2495 my $class = shift; 2550 my $class = shift;
2496 2551
2497 my $self = $class->SUPER::new ( 2552 my $self = $class->SUPER::new (
2498 can_events => 0, 2553 can_events => 0,
2554 scale => 1,
2499 @_, 2555 @_,
2500 ); 2556 );
2501 2557
2502 $self->{path} || $self->{tex} 2558 $self->{path} || $self->{tex}
2503 or Carp::croak "'path' or 'tex' attributes required"; 2559 or Carp::croak "'path' or 'tex' attributes required";
… …
2528} 2584}
2529 2585
2530sub size_request { 2586sub size_request {
2531 my ($self) = @_; 2587 my ($self) = @_;
2532 2588
2533 ($self->{tex}{w}, $self->{tex}{h}) 2589 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2534} 2590}
2535 2591
2536sub _draw { 2592sub _draw {
2537 my ($self) = @_; 2593 my ($self) = @_;
2538 2594
… …
2548 } 2604 }
2549 2605
2550 glEnable GL_TEXTURE_2D; 2606 glEnable GL_TEXTURE_2D;
2551 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2607 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2552 2608
2553 $tex->draw_quad (0, 0, $w, $h); 2609 $tex->draw_quad_alpha (0, 0, $w, $h);
2554 2610
2555 glDisable GL_TEXTURE_2D; 2611 glDisable GL_TEXTURE_2D;
2556} 2612}
2557 2613
2558############################################################################# 2614#############################################################################
… …
2860 2916
2861 $self->SUPER::invoke_button_down ($ev, $x, $y); 2917 $self->SUPER::invoke_button_down ($ev, $x, $y);
2862 2918
2863 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2919 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2864 2920
2865 $self->invoke_mouse_motion ($ev, $x, $y) 2921 $self->invoke_mouse_motion ($ev, $x, $y);
2922
2923 1
2866} 2924}
2867 2925
2868sub invoke_mouse_motion { 2926sub invoke_mouse_motion {
2869 my ($self, $ev, $x, $y) = @_; 2927 my ($self, $ev, $x, $y) = @_;
2870 2928
… …
2890 2948
2891 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 2949 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2892 2950
2893 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 2951 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2894 2952
2895 ! ! $delta 2953 1
2896} 2954}
2897 2955
2898sub update { 2956sub update {
2899 my ($self) = @_; 2957 my ($self) = @_;
2900 2958
… …
3031} 3089}
3032 3090
3033sub size_request { 3091sub size_request {
3034 my ($self) = @_; 3092 my ($self) = @_;
3035 3093
3036 my ($empty, $slider) = @{ $self->{children} }; 3094 my ($empty, $slider) = $self->visible_children;
3037 3095
3038 local $self->{children} = [$empty, $slider]; 3096 local $self->{children} = [$empty, $slider];
3039 $self->SUPER::size_request 3097 $self->SUPER::size_request
3040} 3098}
3041 3099
… …
3473 3531
3474 if ($self->{anim} && $self->{animspeed}) { 3532 if ($self->{anim} && $self->{animspeed}) {
3475 CFPlus::weaken (my $widget = $self); 3533 CFPlus::weaken (my $widget = $self);
3476 3534
3477 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3535 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3478 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3536 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3479 $self->{timer} = Event->timer ( 3537 $self->{timer} = Event->timer (
3480 parked => 1, 3538 parked => 1,
3481 cb => sub { 3539 cb => sub {
3482 return unless $::CONN && $widget; 3540 return unless $::CONN && $widget;
3483 3541
… …
3520 3578
3521 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3579 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3522 if ($anim && @$anim) { 3580 if ($anim && @$anim) {
3523 delete $self->{wait_face}; 3581 delete $self->{wait_face};
3524 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3582 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3583 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3525 } 3584 }
3526 } 3585 }
3527} 3586}
3528 3587
3529sub size_request { 3588sub size_request {
3530 my ($self) = @_; 3589 my ($self) = @_;
3531 3590
3532 if ($::CONN) { 3591 if ($::CONN) {
3533 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3592 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3534 if (my $tex = $::CONN->{texture}[$faceid]) { 3593 if (my $tex = $::CONN->{texture}[$faceid]) {
3594 $self->{tex} = $tex;
3535 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3595 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3536 } else { 3596 } else {
3537 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3597 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3538 $self->realloc; 3598 $self->realloc;
3539 }); 3599 });
… …
3561} 3621}
3562 3622
3563sub _draw { 3623sub _draw {
3564 my ($self) = @_; 3624 my ($self) = @_;
3565 3625
3566 return unless $::CONN;
3567
3568 $self->SUPER::_draw; 3626 $self->SUPER::_draw;
3569 3627
3570 my $faceid = $::CONN->{faceid}[$self->{face}] 3628 if (my $tex = $self->{tex}) {
3571 or return;
3572
3573 my $tex = $::CONN->{texture}[$faceid];
3574
3575 if ($tex) {
3576 glEnable GL_TEXTURE_2D; 3629 glEnable GL_TEXTURE_2D;
3577 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3630 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3578 glColor 0, 0, 0, 1; 3631 glColor 0, 0, 0, 1;
3579 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3632 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3580 glDisable GL_TEXTURE_2D; 3633 glDisable GL_TEXTURE_2D;
… …
3632 children => [ 3685 children => [
3633 (new CFPlus::UI::Label markup => $left, expand => 1), 3686 (new CFPlus::UI::Label markup => $left, expand => 1),
3634 (new CFPlus::UI::Label markup => $right, align => +1), 3687 (new CFPlus::UI::Label markup => $right, align => +1),
3635 ], 3688 ],
3636 ; 3689 ;
3637 3690
3638 } else { 3691 } else {
3639 $widget = new CFPlus::UI::Label 3692 $widget = new CFPlus::UI::Label
3640 can_hover => 1, 3693 can_hover => 1,
3641 can_events => 1, 3694 can_events => 1,
3642 markup => $widget, 3695 markup => $widget,
… …
3778 buttonbar => (new CFPlus::UI::Buttonbar), 3831 buttonbar => (new CFPlus::UI::Buttonbar),
3779 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3832 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3780 # filter => # will be put between multiplexer and $self 3833 # filter => # will be put between multiplexer and $self
3781 @_, 3834 @_,
3782 ); 3835 );
3783 3836
3784 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3837 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3785 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3838 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3786 3839
3840 {
3841 Scalar::Util::weaken (my $wself = $self);
3842
3843 $self->{multiplexer}->connect (c_add => sub {
3844 my ($mplex, $widgets) = @_;
3845
3846 for my $child (@$widgets) {
3847 Scalar::Util::weaken $child;
3848 $child->{c_tab_} ||= do {
3849 my $tab =
3850 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3851 ? $child->{c_tab}
3852 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3853
3854 $tab->connect (activate => sub {
3855 $wself->set_current_page ($child);
3856 });
3857
3858 $tab
3859 };
3860
3861 $self->{buttonbar}->add ($child->{c_tab_});
3862 }
3863 });
3864
3865 $self->{multiplexer}->connect (c_remove => sub {
3866 my ($mplex, $widgets) = @_;
3867
3868 for my $child (@$widgets) {
3869 $wself->{buttonbar}->remove ($child->{c_tab_});
3870 }
3871 });
3872 }
3873
3787 $self 3874 $self
3788} 3875}
3789 3876
3790sub add { 3877sub add {
3878 my ($self, @widgets) = @_;
3879
3880 $self->{multiplexer}->add (@widgets)
3881}
3882
3883sub remove {
3884 my ($self, @widgets) = @_;
3885
3886 $self->{multiplexer}->remove (@widgets)
3887}
3888
3889sub pages {
3890 my ($self) = @_;
3891 $self->{multiplexer}->children
3892}
3893
3894sub add_tab {
3791 my ($self, $title, $widget, $tooltip) = @_; 3895 my ($self, $title, $widget, $tooltip) = @_;
3792 3896
3793 CFPlus::weaken $self; 3897 $title = [$title, $tooltip] unless ref $title;
3898 $widget->{c_tab} = $title;
3794 3899
3795 $self->{buttonbar}->add (new CFPlus::UI::Button
3796 markup => $title,
3797 tooltip => $tooltip,
3798 on_activate => sub { $self->set_current_page ($widget) },
3799 );
3800
3801 $self->{multiplexer}->add ($widget); 3900 $self->add ($widget);
3802} 3901}
3803 3902
3804sub get_current_page { 3903sub get_current_page {
3805 my ($self) = @_; 3904 my ($self) = @_;
3806 3905
… …
4136 while ($self->{refresh_hook}) { 4235 while ($self->{refresh_hook}) {
4137 $_->() 4236 $_->()
4138 for values %{delete $self->{refresh_hook}}; 4237 for values %{delete $self->{refresh_hook}};
4139 } 4238 }
4140 4239
4141 if ($self->{realloc}) { 4240 while ($self->{realloc}) {
4142 my %queue; 4241 my %queue;
4143 my @queue; 4242 my @queue;
4144 my $widget; 4243 my $widget;
4145 4244
4146 outer: 4245 outer:
… …
4193 } 4292 }
4194 } 4293 }
4195 4294
4196 delete $self->{realloc}{$widget+0}; 4295 delete $self->{realloc}{$widget+0};
4197 } 4296 }
4198 }
4199 4297
4200 while (my $size_alloc = delete $self->{size_alloc}) { 4298 while (my $size_alloc = delete $self->{size_alloc}) {
4201 my @queue = sort { $b->{visible} <=> $a->{visible} } 4299 my @queue = sort { $a->{visible} <=> $b->{visible} }
4202 values %$size_alloc; 4300 values %$size_alloc;
4203 4301
4204 while () { 4302 while () {
4205 my $widget = pop @queue || last; 4303 my $widget = pop @queue || last;
4206 4304
4207 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4305 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4208 4306
4209 $w = 0 if $w < 0;
4210 $h = 0 if $h < 0;
4211
4212 $w = max $widget->{min_w}, $w; 4307 $w = max $widget->{min_w}, $w;
4213 $h = max $widget->{min_h}, $h; 4308 $h = max $widget->{min_h}, $h;
4214 4309
4215# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4310# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4216# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4311# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4217 4312
4218 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4313 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4219 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4314 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4220 4315
4221 $w = int $w + 0.5; 4316 $w = int $w + 0.5;
4222 $h = int $h + 0.5; 4317 $h = int $h + 0.5;
4223 4318
4224 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4319 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4225 $widget->{old_w} = $widget->{w}; 4320 $widget->{old_w} = $widget->{w};
4226 $widget->{old_h} = $widget->{h}; 4321 $widget->{old_h} = $widget->{h};
4227 4322
4228 $widget->{w} = $w; 4323 $widget->{w} = $w;
4229 $widget->{h} = $h; 4324 $widget->{h} = $h;
4230 4325
4231 $widget->emit (size_allocate => $w, $h); 4326 $widget->emit (size_allocate => $w, $h);
4327 }
4232 } 4328 }
4233 } 4329 }
4234 } 4330 }
4235 4331
4236 while ($self->{post_alloc_hook}) { 4332 while ($self->{post_alloc_hook}) {

Diff Legend

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