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.420 by root, Wed Jul 25 15:50:17 2007 UTC vs.
Revision 1.437 by root, Wed Aug 22 22:36:26 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#
… …
2227 glColor_premultiply @{$self->{bg}}; 2216 glColor_premultiply @{$self->{bg}};
2228 } 2217 }
2229 2218
2230 glEnable GL_BLEND; 2219 glEnable GL_BLEND;
2231 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2220 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2232 glBegin GL_QUADS;
2233 glVertex 0 , 0;
2234 glVertex 0 , $self->{h};
2235 glVertex $self->{w}, $self->{h}; 2221 glRect 0, 0, $self->{w}, $self->{h};
2236 glVertex $self->{w}, 0;
2237 glEnd;
2238 glDisable GL_BLEND; 2222 glDisable GL_BLEND;
2239 2223
2240 $self->SUPER::_draw; 2224 $self->SUPER::_draw;
2241 2225
2242 #TODO: force update every cursor change :( 2226 #TODO: force update every cursor change :(
… …
2249 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); 2233 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2250 } 2234 }
2251 2235
2252 glColor_premultiply @{$self->{active_fg}}; 2236 glColor_premultiply @{$self->{active_fg}};
2253 glBegin GL_LINES; 2237 glBegin GL_LINES;
2254 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2238 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2255 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2239 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2256 glEnd; 2240 glEnd;
2257 2241
2258 glLineWidth 3; 2242 glLineWidth 3;
2259 glColor @{$self->{active_outline}}; 2243 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; 2244 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2264 glVertex 0, $self->{h} - 1;
2265 glEnd;
2266 glLineWidth 1; 2245 glLineWidth 1;
2267 2246
2268 } else { 2247 } else {
2269 glColor @{$self->{outline}}; 2248 glColor @{$self->{outline}};
2270 glTranslate .375, .375;
2271 glBegin GL_LINE_STRIP; 2249 glBegin GL_LINE_STRIP;
2272 glVertex 0, $self->{h} * .5; 2250 glVertex .5, $self->{h} * .5;
2273 glVertex 0, $self->{h} - 3; 2251 glVertex .5, $self->{h} - 2.5;
2274 glVertex $self->{w} - 1, $self->{h} - 3; 2252 glVertex $self->{w} - .5, $self->{h} - 2.5;
2275 glVertex $self->{w} - 1, $self->{h} * .5; 2253 glVertex $self->{w} - .5, $self->{h} * .5;
2276 glEnd; 2254 glEnd;
2277 } 2255 }
2278} 2256}
2279 2257
2280############################################################################# 2258#############################################################################
… …
2529sub _draw { 2507sub _draw {
2530 my ($self) = @_; 2508 my ($self) = @_;
2531 2509
2532 $self->SUPER::_draw; 2510 $self->SUPER::_draw;
2533 2511
2534 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2512 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2535 2513
2536 my ($w, $h) = @$self{qw(w h)}; 2514 my ($w, $h) = @$self{qw(w h)};
2537 2515
2538 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2516 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2539 2517
… …
2643 align => 0, 2621 align => 0,
2644 valign => 0, 2622 valign => 0,
2645 can_events => 1, 2623 can_events => 1,
2646 @_ 2624 @_
2647 ); 2625 );
2626}
2627
2628sub invoke_button_down {
2629 my ($self, $ev, $x, $y) = @_;
2630
2631 1
2648} 2632}
2649 2633
2650sub invoke_button_up { 2634sub invoke_button_up {
2651 my ($self, $ev, $x, $y) = @_; 2635 my ($self, $ev, $x, $y) = @_;
2652 2636
… …
2792 glDisable GL_TEXTURE_2D; 2776 glDisable GL_TEXTURE_2D;
2793} 2777}
2794 2778
2795############################################################################# 2779#############################################################################
2796 2780
2781package CFPlus::UI::Progress;
2782
2783our @ISA = CFPlus::UI::Label::;
2784
2785use CFPlus::OpenGL;
2786
2787sub new {
2788 my ($class, %arg) = @_;
2789
2790 my $self = $class->SUPER::new (
2791 fg => [1, 1, 1],
2792 bg => [0, 0, 1, 0.2],
2793 bar => [0.7, 0.5, 0.1, 0.8],
2794 outline => [0.4, 0.3, 0],
2795 fontsize => 0.9,
2796 valign => 0,
2797 align => 0,
2798 can_events => 1,
2799 ellipsise => 1,
2800 label => "%d%%",
2801 %arg,
2802 );
2803
2804 $self->set_value ($arg{value} || -1);
2805
2806 $self
2807}
2808
2809sub set_label {
2810 my ($self, $label) = @_;
2811
2812 return if $self->{label} eq $label;
2813 $self->{label} = $label;
2814
2815 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2816}
2817
2818sub set_value {
2819 my ($self, $value) = @_;
2820
2821 if ($self->{value} ne $value) {
2822 $self->{value} = $value;
2823
2824 if ($value < 0) {
2825 $self->set_text ("-");
2826 } else {
2827 $self->set_text (sprintf $self->{label}, $value * 100);
2828 }
2829
2830 $self->update;
2831 }
2832}
2833
2834sub _draw {
2835 my ($self) = @_;
2836
2837 glEnable GL_BLEND;
2838 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2839
2840 if ($self->{value} >= 0) {
2841 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2842
2843 glColor_premultiply @{$self->{bar}};
2844 glRect 2, 2, $s, $self->{h} - 2;
2845 glColor_premultiply @{$self->{bg}};
2846 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2847 }
2848
2849 glColor_premultiply @{$self->{outline}};
2850 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2851
2852 glDisable GL_BLEND;
2853
2854 {
2855 local $self->{bg}; # do not draw background
2856 $self->SUPER::_draw;
2857 }
2858}
2859
2860#############################################################################
2861
2862package CFPlus::UI::ExperienceProgress;
2863
2864our @ISA = CFPlus::UI::Progress::;
2865
2866sub new {
2867 my ($class, %arg) = @_;
2868
2869 my $self = $class->SUPER::new (
2870 tooltip => sub {
2871 my ($self) = @_;
2872
2873 sprintf "level %d\n%s points\n%s next level\n%s to go",
2874 $self->{lvl},
2875 ::formsep ($self->{exp}),
2876 ::formsep ($self->{nxt}),
2877 ::formsep ($self->{nxt} - $self->{exp}),
2878 },
2879 %arg
2880 );
2881
2882 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2883 if $::CONN;
2884
2885 $self
2886}
2887
2888sub DESTROY {
2889 my ($self) = @_;
2890
2891 delete $::CONN->{on_exp_update}{$self+0}
2892 if $::CONN;
2893
2894 $self->SUPER::DESTROY;
2895}
2896
2897sub set_value {
2898 my ($self, $lvl, $exp) = @_;
2899
2900 $self->{lvl} = $lvl;
2901 $self->{exp} = $exp;
2902
2903 my $v = -1;
2904
2905 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2906 my $l0 = $table->[$lvl - 1];
2907 my $l1 = $table->[$lvl];
2908
2909 $self->{nxt} = $l1;
2910
2911 $v = ($exp - $l0) / ($l1 - $l0);
2912 }
2913
2914 $self->SUPER::set_value ($v);
2915}
2916
2917#############################################################################
2918
2797package CFPlus::UI::Gauge; 2919package CFPlus::UI::Gauge;
2798 2920
2799our @ISA = CFPlus::UI::VBox::; 2921our @ISA = CFPlus::UI::VBox::;
2800 2922
2801sub new { 2923sub new {
… …
3298 3420
3299 if ($y0 < $y + $h && $y < $y1) { 3421 if ($y0 < $y + $h && $y < $y1) {
3300 my $layout = $self->get_layout ($para); 3422 my $layout = $self->get_layout ($para);
3301 3423
3302 $layout->render ($para->{indent}, $y - $y0); 3424 $layout->render ($para->{indent}, $y - $y0);
3425 $layout->draw;
3303 3426
3304 if (my @w = @{ $para->{widget} }) { 3427 if (my @w = @{ $para->{widget} }) {
3305 my @s = $layout->get_shapes; 3428 my @s = $layout->get_shapes;
3306 3429
3307 for (@w) { 3430 for (@w) {
… …
3429} 3552}
3430 3553
3431sub set_tooltip_from { 3554sub set_tooltip_from {
3432 my ($self, $widget) = @_; 3555 my ($self, $widget) = @_;
3433 3556
3434 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3435 if $widget->{tooltip} =~ /^#(.*)$/;
3436
3437 my $tooltip = $widget->{tooltip}; 3557 my $tip = $widget->{tooltip};
3558 $tip = $tip->($widget) if "CODE" eq ref $tip;
3559
3560 $tip = CFPlus::Pod::section_label tooltip => $1
3561 if $tip =~ /^#(.*)$/;
3438 3562
3439 if ($ENV{CFPLUS_DEBUG} & 2) { 3563 if ($ENV{CFPLUS_DEBUG} & 2) {
3440 $tooltip .= "\n\n" . (ref $widget) . "\n" 3564 $tip .= "\n\n" . (ref $widget) . "\n"
3441 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3565 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3442 . "req $widget->{req_w} $widget->{req_h}\n" 3566 . "req $widget->{req_w} $widget->{req_h}\n"
3443 . "visible $widget->{visible}"; 3567 . "visible $widget->{visible}";
3444 } 3568 }
3445 3569
3446 $tooltip =~ s/^\n+//; 3570 $tip =~ s/^\n+//;
3447 $tooltip =~ s/\n+$//; 3571 $tip =~ s/\n+$//;
3448 3572
3449 $self->add (new CFPlus::UI::Label 3573 $self->add (new CFPlus::UI::Label
3450 markup => $tooltip, 3574 markup => $tip,
3451 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3575 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3452 fontsize => 0.8, 3576 fontsize => 0.8,
3453 style => 1, # FLAG_INVERSE 3577 style => 1, # FLAG_INVERSE
3454 ellipsise => 0, 3578 ellipsise => 0,
3455 font => ($widget->{tooltip_font} || $::FONT_PROP), 3579 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3493} 3617}
3494 3618
3495sub _draw { 3619sub _draw {
3496 my ($self) = @_; 3620 my ($self) = @_;
3497 3621
3498 glTranslate 0.375, 0.375;
3499
3500 my ($w, $h) = @$self{qw(w h)}; 3622 my ($w, $h) = @$self{qw(w h)};
3501 3623
3502 glColor 1, 0.8, 0.4; 3624 glColor 1, 0.8, 0.4;
3503 glRect 0, 0, $w, $h; 3625 glRect 0, 0, $w, $h;
3504 3626
3505 glColor 0, 0, 0; 3627 glColor 0, 0, 0;
3506 glBegin GL_LINE_LOOP; 3628 glRect_lineloop .5, .5, $w + .5, $h + .5;
3507 glVertex 0 , 0;
3508 glVertex 0 , $h;
3509 glVertex $w, $h;
3510 glVertex $w, 0;
3511 glEnd;
3512 3629
3513 glTranslate 2 - 0.375, 2 - 0.375; 3630 glTranslate 2, 2;
3514 3631
3515 $self->SUPER::_draw; 3632 $self->SUPER::_draw;
3516} 3633}
3517 3634
3518############################################################################# 3635#############################################################################
… …
3540 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3657 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3541 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed}; 3658 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3542 $self->{timer} = Event->timer ( 3659 $self->{timer} = Event->timer (
3543 parked => 1, 3660 parked => 1,
3544 cb => sub { 3661 cb => sub {
3545 return unless $::CONN && $widget; 3662 return unless $::CONN;
3546 3663
3664 my $w = $widget
3665 or return;
3666
3547 ++$widget->{frame}; 3667 ++$w->{frame};
3548 $widget->update_face; 3668 $w->update_face;
3669
3670 # somehow, $widget can go away
3549 $widget->update; 3671 $w->update;
3550
3551 $widget->update_timer; 3672 $w->update_timer;
3552 }, 3673 },
3553 ); 3674 );
3554 3675
3555 $self->update_face; 3676 $self->update_face;
3556 $self->update_timer; 3677 $self->update_timer;
… …
3577} 3698}
3578 3699
3579sub update_face { 3700sub update_face {
3580 my ($self) = @_; 3701 my ($self) = @_;
3581 3702
3582 return unless $::CONN; 3703 if ($::CONN) {
3583
3584 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3704 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3585 if ($anim && @$anim) { 3705 if ($anim && @$anim) {
3586 delete $self->{wait_face};
3587 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3706 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3707 delete $self->{face_change_cb};
3708
3588 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]; 3709 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3710 unless ($tex->{name} || $tex->{loading}) {
3711 $tex->upload (sub { $self->reconfigure });
3712 }
3713 }
3714 }
3589 } 3715 }
3590 } 3716 }
3591} 3717}
3592 3718
3593sub size_request { 3719sub size_request {
3594 my ($self) = @_; 3720 my ($self) = @_;
3595 3721
3596 if ($::CONN) { 3722 if ($::CONN) {
3597 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3723 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3598 if (my $tex = $::CONN->{texture}[$faceid]) { 3724 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3599 $self->{tex} = $tex; 3725 if ($tex->{name}) {
3600 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3726 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3601 } else { 3727 } elsif (!$tex->{loading}) {
3602 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3728 $tex->upload (sub { $self->reconfigure });
3603 $self->realloc;
3604 }); 3729 }
3605 } 3730 }
3731
3732 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3606 } 3733 }
3607 } 3734 }
3608 3735
3609 ($self->{size_w} || 8, $self->{size_h} || 8) 3736 ($self->{size_w} || 8, $self->{size_h} || 8)
3610} 3737}
… …
3825 3952
3826############################################################################# 3953#############################################################################
3827 3954
3828package CFPlus::UI::Notebook; 3955package CFPlus::UI::Notebook;
3829 3956
3957use CFPlus::OpenGL;
3958
3830our @ISA = CFPlus::UI::VBox::; 3959our @ISA = CFPlus::UI::VBox::;
3831 3960
3832sub new { 3961sub new {
3833 my $class = shift; 3962 my $class = shift;
3834 3963
3835 my $self = $class->SUPER::new ( 3964 my $self = $class->SUPER::new (
3836 buttonbar => (new CFPlus::UI::Buttonbar), 3965 buttonbar => (new CFPlus::UI::Buttonbar),
3837 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3966 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3967 active_outline => [.7, .7, 0.2],
3838 # filter => # will be put between multiplexer and $self 3968 # filter => # will be put between multiplexer and $self
3839 @_, 3969 @_,
3840 ); 3970 );
3841 3971
3842 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3972 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3914sub set_current_page { 4044sub set_current_page {
3915 my ($self, $page) = @_; 4045 my ($self, $page) = @_;
3916 4046
3917 $self->{multiplexer}->set_current_page ($page); 4047 $self->{multiplexer}->set_current_page ($page);
3918 $self->emit (page_changed => $self->{multiplexer}{current}); 4048 $self->emit (page_changed => $self->{multiplexer}{current});
4049}
4050
4051sub _draw {
4052 my ($self) = @_;
4053
4054 $self->SUPER::_draw ();
4055
4056 if (my $cur = $self->{multiplexer}{current}) {
4057 if ($cur = $cur->{c_tab_}) {
4058 glTranslate $self->{buttonbar}{x} + $cur->{x},
4059 $self->{buttonbar}{y} + $cur->{y};
4060 glLineWidth 3;
4061 #glEnable GL_BLEND;
4062 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4063 glColor @{$self->{active_outline}};
4064 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4065 glLineWidth 1;
4066 #glDisable GL_BLEND;
4067 }
4068 }
3919} 4069}
3920 4070
3921############################################################################# 4071#############################################################################
3922 4072
3923package CFPlus::UI::Selector; 4073package CFPlus::UI::Selector;
… …
4193} 4343}
4194 4344
4195sub update { 4345sub update {
4196 my ($self) = @_; 4346 my ($self) = @_;
4197 4347
4198 $::WANT_REFRESH++; 4348 $::WANT_REFRESH->start;
4199} 4349}
4200 4350
4201sub add { 4351sub add {
4202 my ($self, @children) = @_; 4352 my ($self, @children) = @_;
4203 4353

Diff Legend

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