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.418 by elmex, Tue Jul 24 18:39:39 2007 UTC vs.
Revision 1.435 by root, Wed Aug 22 21:40:43 2007 UTC

… …
30 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 32
33 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
34 34
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 35 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 36 $TOOLTIP->show;
41 } 37 }
42 38
43 return; 39 return;
… …
607sub DESTROY { 603sub DESTROY {
608 my ($self) = @_; 604 my ($self) = @_;
609 605
610 return if CFPlus::in_destruct; 606 return if CFPlus::in_destruct;
611 607
608 local $@;
612 eval { $self->destroy }; 609 eval { $self->destroy };
613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 610 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614 611
615 delete $WIDGET{$self+0}; 612 delete $WIDGET{$self+0};
616} 613}
… …
624use strict; 621use strict;
625use CFPlus::OpenGL; 622use CFPlus::OpenGL;
626 623
627sub new { 624sub new {
628 my $class = shift; 625 my $class = shift;
629
630 # range [value, low, high, page]
631 626
632 $class->SUPER::new ( 627 $class->SUPER::new (
633 #bg => [0, 0, 0, 0.2], 628 #bg => [0, 0, 0, 0.2],
634 #active_bg => [1, 1, 1, 0.5], 629 #active_bg => [1, 1, 1, 0.5],
635 @_ 630 @_
… …
647 my ($w, $h) = @$self{qw(w h)}; 642 my ($w, $h) = @$self{qw(w h)};
648 643
649 glEnable GL_BLEND; 644 glEnable GL_BLEND;
650 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 645 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
651 glColor_premultiply @$color; 646 glColor_premultiply @$color;
652
653 glBegin GL_QUADS;
654 glVertex 0 , 0;
655 glVertex 0 , $h;
656 glVertex $w, $h; 647 glRect 0, 0, $w, $h;
657 glVertex $w, 0;
658 glEnd;
659
660 glDisable GL_BLEND; 648 glDisable GL_BLEND;
661 } 649 }
662} 650}
663 651
664############################################################################# 652#############################################################################
… …
1027 my $child = delete $arg{child}; 1015 my $child = delete $arg{child};
1028 1016
1029 my $self; 1017 my $self;
1030 1018
1031 my $hslider = new CFPlus::UI::Slider 1019 my $hslider = new CFPlus::UI::Slider
1032 col => 0, 1020 c_col => 0,
1033 row => 1, 1021 c_row => 1,
1034 vertical => 0, 1022 vertical => 0,
1035 range => [0, 0, 1, 0.01], # HACK fix 1023 range => [0, 0, 1, 0.01], # HACK fix
1036 on_changed => sub { 1024 on_changed => sub {
1037 $self->{hpos} = $_[1]; 1025 $self->{hpos} = $_[1];
1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1039 }, 1027 },
1040 ; 1028 ;
1041 1029
1042 my $vslider = new CFPlus::UI::Slider 1030 my $vslider = new CFPlus::UI::Slider
1043 col => 1, 1031 c_col => 1,
1044 row => 0, 1032 c_row => 0,
1045 vertical => 1, 1033 vertical => 1,
1046 range => [0, 0, 1, 0.01], # HACK fix 1034 range => [0, 0, 1, 0.01], # HACK fix
1047 on_changed => sub { 1035 on_changed => sub {
1048 $self->{vpos} = $_[1]; 1036 $self->{vpos} = $_[1];
1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1037 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1060 row_expand => [1, 0], 1048 row_expand => [1, 0],
1061 %arg, 1049 %arg,
1062 ); 1050 );
1063 1051
1064 $self->{vp} = new CFPlus::UI::ViewPort 1052 $self->{vp} = new CFPlus::UI::ViewPort
1065 col => 0, 1053 c_col => 0,
1066 row => 0, 1054 c_row => 0,
1067 expand => 1, 1055 expand => 1,
1068 scroll_x => $self->{scroll_x}, 1056 scroll_x => $self->{scroll_x},
1069 scroll_y => $self->{scroll_y}, 1057 scroll_y => $self->{scroll_y},
1070 on_changed => sub { 1058 on_changed => sub {
1071 my ($vp, $x, $y) = @_; 1059 my ($vp, $x, $y) = @_;
… …
1219 my ($w, $h) = @$self{qw(w h)}; 1207 my ($w, $h) = @$self{qw(w h)};
1220 1208
1221 glEnable GL_BLEND; 1209 glEnable GL_BLEND;
1222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1210 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1223 glColor_premultiply @{ $self->{bg} }; 1211 glColor_premultiply @{ $self->{bg} };
1224
1225 glBegin GL_QUADS;
1226 glVertex 0 , 0;
1227 glVertex 0 , $h;
1228 glVertex $w, $h; 1212 glRect 0, 0, $w, $h;
1229 glVertex $w, 0;
1230 glEnd;
1231
1232 glDisable GL_BLEND; 1213 glDisable GL_BLEND;
1233 } 1214 }
1234 1215
1235 $self->SUPER::_draw; 1216 $self->SUPER::_draw;
1236} 1217}
… …
1598 1579
1599sub add { 1580sub add {
1600 my ($self, @widgets) = @_; 1581 my ($self, @widgets) = @_;
1601 1582
1602 for my $child (@widgets) { 1583 for my $child (@widgets) {
1603 $child->{rowspan} ||= 1; 1584 $child->{c_rowspan} ||= 1;
1604 $child->{colspan} ||= 1; 1585 $child->{c_colspan} ||= 1;
1605 } 1586 }
1606 1587
1607 $self->SUPER::add (@widgets); 1588 $self->SUPER::add (@widgets);
1608} 1589}
1609 1590
… …
1613 my @widgets; 1594 my @widgets;
1614 1595
1615 while (@_) { 1596 while (@_) {
1616 my ($col, $row, $child) = splice @_, 0, 3, (); 1597 my ($col, $row, $child) = splice @_, 0, 3, ();
1617 1598
1618 $child->{row} = $row; 1599 $child->{c_row} = $row;
1619 $child->{col} = $col; 1600 $child->{c_col} = $col;
1620 1601
1621 push @widgets, $child; 1602 push @widgets, $child;
1622 } 1603 }
1623 1604
1624 $self->add (@widgets); 1605 $self->add (@widgets);
… …
1630 my (@w, @h); 1611 my (@w, @h);
1631 1612
1632 my @children = $self->children; 1613 my @children = $self->children;
1633 1614
1634 # first pass, columns 1615 # first pass, columns
1635 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1616 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1636 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1617 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1637 1618
1638 my $sw = sum @w[$c .. $c + $cs - 1]; 1619 my $sw = sum @w[$c .. $c + $cs - 1];
1639 1620
1640 if ($w > $sw) { 1621 if ($w > $sw) {
1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1622 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642 } 1623 }
1643 } 1624 }
1644 1625
1645 # second pass, rows 1626 # second pass, rows
1646 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1627 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1647 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1628 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1648 1629
1649 my $sh = sum @h[$r .. $r + $rs - 1]; 1630 my $sh = sum @h[$r .. $r + $rs - 1];
1650 1631
1651 if ($h > $sh) { 1632 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1633 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
… …
1694 1675
1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1676 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1677 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1697 1678
1698 for my $widget ($self->children) { 1679 for my $widget ($self->children) {
1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1680 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1700 1681
1701 $widget->configure ( 1682 $widget->configure (
1702 $x[$c], $y[$r], 1683 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1684 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1704 ); 1685 );
… …
1923 1904
1924 delete $self->{ox}; 1905 delete $self->{ox};
1925 $self->SUPER::realloc; 1906 $self->SUPER::realloc;
1926} 1907}
1927 1908
1909sub clear {
1910 my ($self) = @_;
1911
1912 $self->set_text ("");
1913}
1914
1928sub set_text { 1915sub set_text {
1929 my ($self, $text) = @_; 1916 my ($self, $text) = @_;
1930 1917
1931 return if $self->{text} eq "T$text"; 1918 return if $self->{text} eq "T$text";
1932 $self->{text} = "T$text"; 1919 $self->{text} = "T$text";
… …
2038 : ($self->{w} - $size->[0]) * 0.5); 2025 : ($self->{w} - $size->[0]) * 0.5);
2039 2026
2040 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2041 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2042 : ($self->{h} - $size->[1]) * 0.5); 2029 : ($self->{h} - $size->[1]) * 0.5);
2030
2031 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2043 }; 2032 };
2044 2033
2045# unless ($self->{list}) { 2034# unless ($self->{list}) {
2046# $self->{list} = CFPlus::OpenGL::glGenList; 2035# $self->{list} = CFPlus::OpenGL::glGenList;
2047# CFPlus::OpenGL::glNewList $self->{list}; 2036# CFPlus::OpenGL::glNewList $self->{list};
… …
2049# CFPlus::OpenGL::glEndList; 2038# CFPlus::OpenGL::glEndList;
2050# } 2039# }
2051# 2040#
2052# CFPlus::OpenGL::glCallList $self->{list}; 2041# CFPlus::OpenGL::glCallList $self->{list};
2053 2042
2054 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2043 $self->{layout}->draw;
2055} 2044}
2056 2045
2057#sub destroy { 2046#sub destroy {
2058# my ($self) = @_; 2047# my ($self) = @_;
2059# 2048#
… …
2074 my $class = shift; 2063 my $class = shift;
2075 2064
2076 $class->SUPER::new ( 2065 $class->SUPER::new (
2077 fg => [1, 1, 1], 2066 fg => [1, 1, 1],
2078 bg => [0, 0, 0, 0.2], 2067 bg => [0, 0, 0, 0.2],
2068 outline => [0.6, 0.3, 0.1],
2079 active_bg => [0, 0, 1, .2], 2069 active_bg => [0, 0, 1, .2],
2080 active_fg => [1, 1, 1], 2070 active_fg => [1, 1, 1],
2081 active_outline => [1, 1, 0], 2071 active_outline => [1, 1, 0],
2082 can_hover => 1, 2072 can_hover => 1,
2083 can_focus => 1, 2073 can_focus => 1,
… …
2226 glColor_premultiply @{$self->{bg}}; 2216 glColor_premultiply @{$self->{bg}};
2227 } 2217 }
2228 2218
2229 glEnable GL_BLEND; 2219 glEnable GL_BLEND;
2230 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2220 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2231 glBegin GL_QUADS;
2232 glVertex 0 , 0;
2233 glVertex 0 , $self->{h};
2234 glVertex $self->{w}, $self->{h}; 2221 glRect 0, 0, $self->{w}, $self->{h};
2235 glVertex $self->{w}, 0;
2236 glEnd;
2237 glDisable GL_BLEND; 2222 glDisable GL_BLEND;
2238 2223
2239 $self->SUPER::_draw; 2224 $self->SUPER::_draw;
2240 2225
2241 #TODO: force update every cursor change :( 2226 #TODO: force update every cursor change :(
… …
2254 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2239 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2255 glEnd; 2240 glEnd;
2256 2241
2257 glLineWidth 3; 2242 glLineWidth 3;
2258 glColor @{$self->{active_outline}}; 2243 glColor @{$self->{active_outline}};
2244 glRect_lineloop 0, 0, $self->{w} - 1, $self->{h} - 1;
2245 glLineWidth 1;
2246
2247 } else {
2248 glColor @{$self->{outline}};
2259 glTranslate -.375, -.375; 2249 glTranslate .375, .375;
2260 glBegin GL_LINE_LOOP; 2250 glBegin GL_LINE_STRIP;
2261 glVertex 0, 0; 2251 glVertex 0, $self->{h} * .5;
2262 glVertex $self->{w}, 0;
2263 glVertex $self->{w}, $self->{h};
2264 glVertex 0, $self->{h}; 2252 glVertex 0, $self->{h} - 3;
2253 glVertex $self->{w} - 1, $self->{h} - 3;
2254 glVertex $self->{w} - 1, $self->{h} * .5;
2265 glEnd; 2255 glEnd;
2266 glLineWidth 1;
2267 } 2256 }
2268} 2257}
2269 2258
2270############################################################################# 2259#############################################################################
2271 2260
… …
2633 align => 0, 2622 align => 0,
2634 valign => 0, 2623 valign => 0,
2635 can_events => 1, 2624 can_events => 1,
2636 @_ 2625 @_
2637 ); 2626 );
2627}
2628
2629sub invoke_button_down {
2630 my ($self, $ev, $x, $y) = @_;
2631
2632 1
2638} 2633}
2639 2634
2640sub invoke_button_up { 2635sub invoke_button_up {
2641 my ($self, $ev, $x, $y) = @_; 2636 my ($self, $ev, $x, $y) = @_;
2642 2637
… …
2782 glDisable GL_TEXTURE_2D; 2777 glDisable GL_TEXTURE_2D;
2783} 2778}
2784 2779
2785############################################################################# 2780#############################################################################
2786 2781
2782package CFPlus::UI::Progress;
2783
2784our @ISA = CFPlus::UI::Label::;
2785
2786use CFPlus::OpenGL;
2787
2788sub new {
2789 my ($class, %arg) = @_;
2790
2791 my $self = $class->SUPER::new (
2792 fg => [1, 1, 1],
2793 bg => [0, 0, 1, 0.2],
2794 bar => [0.7, 0.5, 0.1, 0.8],
2795 outline => [0.4, 0.3, 0],
2796 fontsize => 0.9,
2797 valign => 0,
2798 align => 0,
2799 can_events => 1,
2800 ellipsise => 1,
2801 label => "%d%%",
2802 %arg,
2803 );
2804
2805 $self->set_value ($arg{value} || -1);
2806
2807 $self
2808}
2809
2810sub set_label {
2811 my ($self, $label) = @_;
2812
2813 return if $self->{label} eq $label;
2814 $self->{label} = $label;
2815
2816 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2817}
2818
2819sub set_value {
2820 my ($self, $value) = @_;
2821
2822 if ($self->{value} ne $value) {
2823 $self->{value} = $value;
2824
2825 if ($value < 0) {
2826 $self->set_text ("-");
2827 } else {
2828 $self->set_text (sprintf $self->{label}, $value * 100);
2829 }
2830
2831 $self->update;
2832 }
2833}
2834
2835sub _draw {
2836 my ($self) = @_;
2837
2838 glEnable GL_BLEND;
2839 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2840
2841 if ($self->{value} >= 0) {
2842 my $s = 3 + ($self->{w} - 6) * $self->{value};
2843
2844 glColor_premultiply @{$self->{bar}};
2845 glRect 2, 2, $s, $self->{h} - 2;
2846 glColor_premultiply @{$self->{bg}};
2847 glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
2848 }
2849
2850 glColor_premultiply @{$self->{outline}};
2851 glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
2852
2853 glDisable GL_BLEND;
2854
2855 {
2856 local $self->{bg}; # do not draw background
2857 $self->SUPER::_draw;
2858 }
2859}
2860
2861#############################################################################
2862
2863package CFPlus::UI::ExperienceProgress;
2864
2865our @ISA = CFPlus::UI::Progress::;
2866
2867sub new {
2868 my ($class, %arg) = @_;
2869
2870 my $self = $class->SUPER::new (
2871 tooltip => sub {
2872 my ($self) = @_;
2873
2874 sprintf "level %d\n%s points\n%s next level\n%s to go",
2875 $self->{lvl},
2876 ::formsep ($self->{exp}),
2877 ::formsep ($self->{nxt}),
2878 ::formsep ($self->{nxt} - $self->{exp}),
2879 },
2880 %arg
2881 );
2882
2883 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2884 if $::CONN;
2885
2886 $self
2887}
2888
2889sub DESTROY {
2890 my ($self) = @_;
2891
2892 delete $::CONN->{on_exp_update}{$self+0}
2893 if $::CONN;
2894
2895 $self->SUPER::DESTROY;
2896}
2897
2898sub set_value {
2899 my ($self, $lvl, $exp) = @_;
2900
2901<<<<<<< UI.pm
2902 $self->{lvl} = $lvl;
2903 $self->{exp} = $exp;
2904
2905=======
2906 $self->{lvl} = $exp;
2907 $self->{exp} = $exp;
2908
2909>>>>>>> 1.434
2910 my $v = -1;
2911
2912 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2913 my $l0 = $table->[$lvl - 1];
2914 my $l1 = $table->[$lvl];
2915
2916 $self->{nxt} = $l1;
2917
2918 $v = ($exp - $l0) / ($l1 - $l0);
2919 }
2920
2921 $self->SUPER::set_value ($v);
2922}
2923
2924#############################################################################
2925
2787package CFPlus::UI::Gauge; 2926package CFPlus::UI::Gauge;
2788 2927
2789our @ISA = CFPlus::UI::VBox::; 2928our @ISA = CFPlus::UI::VBox::;
2790 2929
2791sub new { 2930sub new {
… …
3288 3427
3289 if ($y0 < $y + $h && $y < $y1) { 3428 if ($y0 < $y + $h && $y < $y1) {
3290 my $layout = $self->get_layout ($para); 3429 my $layout = $self->get_layout ($para);
3291 3430
3292 $layout->render ($para->{indent}, $y - $y0); 3431 $layout->render ($para->{indent}, $y - $y0);
3432 $layout->draw;
3293 3433
3294 if (my @w = @{ $para->{widget} }) { 3434 if (my @w = @{ $para->{widget} }) {
3295 my @s = $layout->get_shapes; 3435 my @s = $layout->get_shapes;
3296 3436
3297 for (@w) { 3437 for (@w) {
… …
3419} 3559}
3420 3560
3421sub set_tooltip_from { 3561sub set_tooltip_from {
3422 my ($self, $widget) = @_; 3562 my ($self, $widget) = @_;
3423 3563
3424 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3425 if $widget->{tooltip} =~ /^#(.*)$/;
3426
3427 my $tooltip = $widget->{tooltip}; 3564 my $tip = $widget->{tooltip};
3565 $tip = $tip->($widget) if "CODE" eq ref $tip;
3566
3567 $tip = CFPlus::Pod::section_label tooltip => $1
3568 if $tip =~ /^#(.*)$/;
3428 3569
3429 if ($ENV{CFPLUS_DEBUG} & 2) { 3570 if ($ENV{CFPLUS_DEBUG} & 2) {
3430 $tooltip .= "\n\n" . (ref $widget) . "\n" 3571 $tip .= "\n\n" . (ref $widget) . "\n"
3431 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3572 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3432 . "req $widget->{req_w} $widget->{req_h}\n" 3573 . "req $widget->{req_w} $widget->{req_h}\n"
3433 . "visible $widget->{visible}"; 3574 . "visible $widget->{visible}";
3434 } 3575 }
3435 3576
3436 $tooltip =~ s/^\n+//; 3577 $tip =~ s/^\n+//;
3437 $tooltip =~ s/\n+$//; 3578 $tip =~ s/\n+$//;
3438 3579
3439 $self->add (new CFPlus::UI::Label 3580 $self->add (new CFPlus::UI::Label
3440 markup => $tooltip, 3581 markup => $tip,
3441 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3582 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3442 fontsize => 0.8, 3583 fontsize => 0.8,
3443 style => 1, # FLAG_INVERSE 3584 style => 1, # FLAG_INVERSE
3444 ellipsise => 0, 3585 ellipsise => 0,
3445 font => ($widget->{tooltip_font} || $::FONT_PROP), 3586 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3488 glTranslate 0.375, 0.375; 3629 glTranslate 0.375, 0.375;
3489 3630
3490 my ($w, $h) = @$self{qw(w h)}; 3631 my ($w, $h) = @$self{qw(w h)};
3491 3632
3492 glColor 1, 0.8, 0.4; 3633 glColor 1, 0.8, 0.4;
3493 glBegin GL_QUADS; 3634 glRect 0, 0, $w, $h;
3494 glVertex 0 , 0;
3495 glVertex 0 , $h;
3496 glVertex $w, $h;
3497 glVertex $w, 0;
3498 glEnd;
3499 3635
3500 glColor 0, 0, 0; 3636 glColor 0, 0, 0;
3501 glBegin GL_LINE_LOOP; 3637 glRect_lineloop 0, 0, $w, $h;
3502 glVertex 0 , 0;
3503 glVertex 0 , $h;
3504 glVertex $w, $h;
3505 glVertex $w, 0;
3506 glEnd;
3507 3638
3508 glTranslate 2 - 0.375, 2 - 0.375; 3639 glTranslate 2 - 0.375, 2 - 0.375;
3509 3640
3510 $self->SUPER::_draw; 3641 $self->SUPER::_draw;
3511} 3642}
… …
3535 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3666 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3536 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed}; 3667 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3537 $self->{timer} = Event->timer ( 3668 $self->{timer} = Event->timer (
3538 parked => 1, 3669 parked => 1,
3539 cb => sub { 3670 cb => sub {
3540 return unless $::CONN && $widget; 3671 return unless $::CONN;
3541 3672
3673 my $w = $widget
3674 or return;
3675
3542 ++$widget->{frame}; 3676 ++$w->{frame};
3543 $widget->update_face; 3677 $w->update_face;
3678
3679 # somehow, $widget can go away
3544 $widget->update; 3680 $w->update;
3545
3546 $widget->update_timer; 3681 $w->update_timer;
3547 }, 3682 },
3548 ); 3683 );
3549 3684
3550 $self->update_face; 3685 $self->update_face;
3551 $self->update_timer; 3686 $self->update_timer;
… …
3572} 3707}
3573 3708
3574sub update_face { 3709sub update_face {
3575 my ($self) = @_; 3710 my ($self) = @_;
3576 3711
3577 return unless $::CONN; 3712 if ($::CONN) {
3578
3579 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3713 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3580 if ($anim && @$anim) { 3714 if ($anim && @$anim) {
3581 delete $self->{wait_face};
3582 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3715 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3716 delete $self->{face_change_cb};
3717
3583 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]; 3718 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3719 unless ($tex->{name} || $tex->{loading}) {
3720 $tex->upload (sub { $self->reconfigure });
3721 }
3722 }
3723 }
3584 } 3724 }
3585 } 3725 }
3586} 3726}
3587 3727
3588sub size_request { 3728sub size_request {
3589 my ($self) = @_; 3729 my ($self) = @_;
3590 3730
3591 if ($::CONN) { 3731 if ($::CONN) {
3592 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3732 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3593 if (my $tex = $::CONN->{texture}[$faceid]) { 3733 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3594 $self->{tex} = $tex; 3734 if ($tex->{name}) {
3595 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3735 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3596 } else { 3736 } elsif (!$tex->{loading}) {
3597 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3737 $tex->upload (sub { $self->reconfigure });
3598 $self->realloc;
3599 }); 3738 }
3600 } 3739 }
3740
3741 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3601 } 3742 }
3602 } 3743 }
3603 3744
3604 ($self->{size_w} || 8, $self->{size_h} || 8) 3745 ($self->{size_w} || 8, $self->{size_h} || 8)
3605} 3746}
… …
3820 3961
3821############################################################################# 3962#############################################################################
3822 3963
3823package CFPlus::UI::Notebook; 3964package CFPlus::UI::Notebook;
3824 3965
3966use CFPlus::OpenGL;
3967
3825our @ISA = CFPlus::UI::VBox::; 3968our @ISA = CFPlus::UI::VBox::;
3826 3969
3827sub new { 3970sub new {
3828 my $class = shift; 3971 my $class = shift;
3829 3972
3830 my $self = $class->SUPER::new ( 3973 my $self = $class->SUPER::new (
3831 buttonbar => (new CFPlus::UI::Buttonbar), 3974 buttonbar => (new CFPlus::UI::Buttonbar),
3832 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3975 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3976 active_outline => [1, 1, 0],
3833 # filter => # will be put between multiplexer and $self 3977 # filter => # will be put between multiplexer and $self
3834 @_, 3978 @_,
3835 ); 3979 );
3836 3980
3837 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3981 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3909sub set_current_page { 4053sub set_current_page {
3910 my ($self, $page) = @_; 4054 my ($self, $page) = @_;
3911 4055
3912 $self->{multiplexer}->set_current_page ($page); 4056 $self->{multiplexer}->set_current_page ($page);
3913 $self->emit (page_changed => $self->{multiplexer}{current}); 4057 $self->emit (page_changed => $self->{multiplexer}{current});
4058}
4059
4060sub _draw {
4061 my ($self) = @_;
4062
4063 $self->SUPER::_draw ();
4064
4065 if (my $cur = $self->{multiplexer}{current}) {
4066 if ($cur = $cur->{c_tab_}) {
4067 glTranslate $cur->{x}, $cur->{y};
4068 glLineWidth 3;
4069 glColor @{$self->{active_outline}};
4070 glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
4071 glLineWidth 1;
4072 }
4073 }
3914} 4074}
3915 4075
3916############################################################################# 4076#############################################################################
3917 4077
3918package CFPlus::UI::Selector; 4078package CFPlus::UI::Selector;
… …
4188} 4348}
4189 4349
4190sub update { 4350sub update {
4191 my ($self) = @_; 4351 my ($self) = @_;
4192 4352
4193 $::WANT_REFRESH++; 4353 $::WANT_REFRESH->start;
4194} 4354}
4195 4355
4196sub add { 4356sub add {
4197 my ($self, @children) = @_; 4357 my ($self, @children) = @_;
4198 4358

Diff Legend

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