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.421 by root, Wed Aug 1 14:27:21 2007 UTC vs.
Revision 1.442 by root, Mon Oct 8 17:01:03 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;
… …
273 $self->emit ("destroy"); 269 $self->emit ("destroy");
274 %$self = (); 270 %$self = ();
275} 271}
276 272
277sub TO_JSON { 273sub TO_JSON {
278 { __w_ => $_[0]{s_id} } 274 { "\fw" => $_[0]{s_id} }
279} 275}
280 276
281sub show { 277sub show {
282 my ($self) = @_; 278 my ($self) = @_;
283 279
… …
362 358
363 $self->{force_w} = $w; 359 $self->{force_w} = $w;
364 $self->{force_h} = $h; 360 $self->{force_h} = $h;
365 361
366 $self->realloc; 362 $self->realloc;
363}
364
365# traverse the widget chain up to find the maximum "physical" size constraints
366sub get_max_wh {
367 my ($self) = @_;
368
369 return $self->{parent}->get_max_wh
370 if $self->{parent};
371
372 ($::WIDTH, $::HEIGHT)
367} 373}
368 374
369sub size_request { 375sub size_request {
370 require Carp; 376 require Carp;
371 Carp::confess "size_request is abstract"; 377 Carp::confess "size_request is abstract";
… …
607sub DESTROY { 613sub DESTROY {
608 my ($self) = @_; 614 my ($self) = @_;
609 615
610 return if CFPlus::in_destruct; 616 return if CFPlus::in_destruct;
611 617
618 local $@;
612 eval { $self->destroy }; 619 eval { $self->destroy };
613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 620 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614 621
615 delete $WIDGET{$self+0}; 622 delete $WIDGET{$self+0};
616} 623}
… …
624use strict; 631use strict;
625use CFPlus::OpenGL; 632use CFPlus::OpenGL;
626 633
627sub new { 634sub new {
628 my $class = shift; 635 my $class = shift;
629
630 # range [value, low, high, page]
631 636
632 $class->SUPER::new ( 637 $class->SUPER::new (
633 #bg => [0, 0, 0, 0.2], 638 #bg => [0, 0, 0, 0.2],
634 #active_bg => [1, 1, 1, 0.5], 639 #active_bg => [1, 1, 1, 0.5],
635 @_ 640 @_
… …
647 my ($w, $h) = @$self{qw(w h)}; 652 my ($w, $h) = @$self{qw(w h)};
648 653
649 glEnable GL_BLEND; 654 glEnable GL_BLEND;
650 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 655 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
651 glColor_premultiply @$color; 656 glColor_premultiply @$color;
652
653 glBegin GL_QUADS;
654 glVertex 0 , 0;
655 glVertex 0 , $h;
656 glVertex $w, $h; 657 glRect 0, 0, $w, $h;
657 glVertex $w, 0;
658 glEnd;
659
660 glDisable GL_BLEND; 658 glDisable GL_BLEND;
661 } 659 }
662} 660}
663 661
664############################################################################# 662#############################################################################
… …
829 827
830 1 828 1
831} 829}
832 830
833############################################################################# 831#############################################################################
834
835# back-buffered drawing area 832# back-buffered drawing area
836 833
837package CFPlus::UI::Window; 834package CFPlus::UI::Window;
838 835
839our @ISA = CFPlus::UI::Bin::; 836our @ISA = CFPlus::UI::Bin::;
… …
1219 my ($w, $h) = @$self{qw(w h)}; 1216 my ($w, $h) = @$self{qw(w h)};
1220 1217
1221 glEnable GL_BLEND; 1218 glEnable GL_BLEND;
1222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1219 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1223 glColor_premultiply @{ $self->{bg} }; 1220 glColor_premultiply @{ $self->{bg} };
1224
1225 glBegin GL_QUADS;
1226 glVertex 0 , 0;
1227 glVertex 0 , $h;
1228 glVertex $w, $h; 1221 glRect 0, 0, $w, $h;
1229 glVertex $w, 0;
1230 glEnd;
1231
1232 glDisable GL_BLEND; 1222 glDisable GL_BLEND;
1233 } 1223 }
1234 1224
1235 $self->SUPER::_draw; 1225 $self->SUPER::_draw;
1236} 1226}
… …
1395 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1385 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1396} 1386}
1397 1387
1398sub border { 1388sub border {
1399 int $_[0]{border} * $::FONTSIZE 1389 int $_[0]{border} * $::FONTSIZE
1390}
1391
1392sub get_max_wh {
1393 my ($self) = @_;
1394
1395 return ($self->{w}, $self->{h})
1396 if $self->{visible} && $self->{w};
1397
1398 $self->SUPER::get_max_wh
1400} 1399}
1401 1400
1402sub size_request { 1401sub size_request {
1403 my ($self) = @_; 1402 my ($self) = @_;
1404 1403
… …
1923 1922
1924 delete $self->{ox}; 1923 delete $self->{ox};
1925 $self->SUPER::realloc; 1924 $self->SUPER::realloc;
1926} 1925}
1927 1926
1927sub clear {
1928 my ($self) = @_;
1929
1930 $self->set_text ("");
1931}
1932
1928sub set_text { 1933sub set_text {
1929 my ($self, $text) = @_; 1934 my ($self, $text) = @_;
1930 1935
1931 return if $self->{text} eq "T$text"; 1936 return if $self->{text} eq "T$text";
1932 $self->{text} = "T$text"; 1937 $self->{text} = "T$text";
… …
1955 1960
1956sub size_request { 1961sub size_request {
1957 my ($self) = @_; 1962 my ($self) = @_;
1958 1963
1959 $self->{size_req} ||= do { 1964 $self->{size_req} ||= do {
1965 my ($max_w, $max_h) = $self->get_max_wh;
1966
1960 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1967 $self->{layout}->set_font ($self->{font}) if $self->{font};
1961 $self->{layout}->set_width ($self->{max_w} || -1); 1968 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1962 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1969 $self->{layout}->set_ellipsise ($self->{ellipsise});
1963 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1970 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1964 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1971 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1965 1972
1966 my ($w, $h) = $self->{layout}->size; 1973 my ($w, $h) = $self->{layout}->size;
… …
2038 : ($self->{w} - $size->[0]) * 0.5); 2045 : ($self->{w} - $size->[0]) * 0.5);
2039 2046
2040 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2047 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2041 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2048 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2042 : ($self->{h} - $size->[1]) * 0.5); 2049 : ($self->{h} - $size->[1]) * 0.5);
2050
2051 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2043 }; 2052 };
2044 2053
2045# unless ($self->{list}) { 2054# unless ($self->{list}) {
2046# $self->{list} = CFPlus::OpenGL::glGenList; 2055# $self->{list} = CFPlus::OpenGL::glGenList;
2047# CFPlus::OpenGL::glNewList $self->{list}; 2056# CFPlus::OpenGL::glNewList $self->{list};
… …
2049# CFPlus::OpenGL::glEndList; 2058# CFPlus::OpenGL::glEndList;
2050# } 2059# }
2051# 2060#
2052# CFPlus::OpenGL::glCallList $self->{list}; 2061# CFPlus::OpenGL::glCallList $self->{list};
2053 2062
2054 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2063 $self->{layout}->draw;
2055} 2064}
2056 2065
2057#sub destroy { 2066#sub destroy {
2058# my ($self) = @_; 2067# my ($self) = @_;
2059# 2068#
… …
2227 glColor_premultiply @{$self->{bg}}; 2236 glColor_premultiply @{$self->{bg}};
2228 } 2237 }
2229 2238
2230 glEnable GL_BLEND; 2239 glEnable GL_BLEND;
2231 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2240 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}; 2241 glRect 0, 0, $self->{w}, $self->{h};
2236 glVertex $self->{w}, 0;
2237 glEnd;
2238 glDisable GL_BLEND; 2242 glDisable GL_BLEND;
2239 2243
2240 $self->SUPER::_draw; 2244 $self->SUPER::_draw;
2241 2245
2242 #TODO: force update every cursor change :( 2246 #TODO: force update every cursor change :(
… …
2249 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); 2253 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2250 } 2254 }
2251 2255
2252 glColor_premultiply @{$self->{active_fg}}; 2256 glColor_premultiply @{$self->{active_fg}};
2253 glBegin GL_LINES; 2257 glBegin GL_LINES;
2254 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2258 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}; 2259 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2256 glEnd; 2260 glEnd;
2257 2261
2258 glLineWidth 3; 2262 glLineWidth 3;
2259 glColor @{$self->{active_outline}}; 2263 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 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; 2265 glLineWidth 1;
2267 2266
2268 } else { 2267 } else {
2269 glColor @{$self->{outline}}; 2268 glColor @{$self->{outline}};
2270 glTranslate .375, .375;
2271 glBegin GL_LINE_STRIP; 2269 glBegin GL_LINE_STRIP;
2272 glVertex 0, $self->{h} * .5; 2270 glVertex .5, $self->{h} * .5;
2273 glVertex 0, $self->{h} - 3; 2271 glVertex .5, $self->{h} - 2.5;
2274 glVertex $self->{w} - 1, $self->{h} - 3; 2272 glVertex $self->{w} - .5, $self->{h} - 2.5;
2275 glVertex $self->{w} - 1, $self->{h} * .5; 2273 glVertex $self->{w} - .5, $self->{h} * .5;
2276 glEnd; 2274 glEnd;
2277 } 2275 }
2278} 2276}
2279 2277
2280############################################################################# 2278#############################################################################
… …
2529sub _draw { 2527sub _draw {
2530 my ($self) = @_; 2528 my ($self) = @_;
2531 2529
2532 $self->SUPER::_draw; 2530 $self->SUPER::_draw;
2533 2531
2534 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2532 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2535 2533
2536 my ($w, $h) = @$self{qw(w h)}; 2534 my ($w, $h) = @$self{qw(w h)};
2537 2535
2538 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2536 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2539 2537
… …
2643 align => 0, 2641 align => 0,
2644 valign => 0, 2642 valign => 0,
2645 can_events => 1, 2643 can_events => 1,
2646 @_ 2644 @_
2647 ); 2645 );
2646}
2647
2648sub invoke_button_down {
2649 my ($self, $ev, $x, $y) = @_;
2650
2651 1
2648} 2652}
2649 2653
2650sub invoke_button_up { 2654sub invoke_button_up {
2651 my ($self, $ev, $x, $y) = @_; 2655 my ($self, $ev, $x, $y) = @_;
2652 2656
… …
2792 glDisable GL_TEXTURE_2D; 2796 glDisable GL_TEXTURE_2D;
2793} 2797}
2794 2798
2795############################################################################# 2799#############################################################################
2796 2800
2801package CFPlus::UI::Progress;
2802
2803our @ISA = CFPlus::UI::Label::;
2804
2805use CFPlus::OpenGL;
2806
2807sub new {
2808 my ($class, %arg) = @_;
2809
2810 my $self = $class->SUPER::new (
2811 fg => [1, 1, 1],
2812 bg => [0, 0, 1, 0.2],
2813 bar => [0.7, 0.5, 0.1, 0.8],
2814 outline => [0.4, 0.3, 0],
2815 fontsize => 0.9,
2816 valign => 0,
2817 align => 0,
2818 can_events => 1,
2819 ellipsise => 1,
2820 label => "%d%%",
2821 %arg,
2822 );
2823
2824 $self->set_value ($arg{value} || -1);
2825
2826 $self
2827}
2828
2829sub set_label {
2830 my ($self, $label) = @_;
2831
2832 return if $self->{label} eq $label;
2833 $self->{label} = $label;
2834
2835 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2836}
2837
2838sub set_value {
2839 my ($self, $value) = @_;
2840
2841 if ($self->{value} ne $value) {
2842 $self->{value} = $value;
2843
2844 if ($value < 0) {
2845 $self->set_text ("-");
2846 } else {
2847 $self->set_text (sprintf $self->{label}, $value * 100);
2848 }
2849
2850 $self->update;
2851 }
2852}
2853
2854sub _draw {
2855 my ($self) = @_;
2856
2857 glEnable GL_BLEND;
2858 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2859
2860 if ($self->{value} >= 0) {
2861 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2862
2863 glColor_premultiply @{$self->{bar}};
2864 glRect 2, 2, $s, $self->{h} - 2;
2865 glColor_premultiply @{$self->{bg}};
2866 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2867 }
2868
2869 glColor_premultiply @{$self->{outline}};
2870 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2871
2872 glDisable GL_BLEND;
2873
2874 {
2875 local $self->{bg}; # do not draw background
2876 $self->SUPER::_draw;
2877 }
2878}
2879
2880#############################################################################
2881
2882package CFPlus::UI::ExperienceProgress;
2883
2884our @ISA = CFPlus::UI::Progress::;
2885
2886sub new {
2887 my ($class, %arg) = @_;
2888
2889 my $self = $class->SUPER::new (
2890 tooltip => sub {
2891 my ($self) = @_;
2892
2893 sprintf "level %d\n%s points\n%s next level\n%s to go",
2894 $self->{lvl},
2895 ::formsep ($self->{exp}),
2896 ::formsep ($self->{nxt}),
2897 ::formsep ($self->{nxt} - $self->{exp}),
2898 },
2899 %arg
2900 );
2901
2902 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2903 if $::CONN;
2904
2905 $self
2906}
2907
2908sub DESTROY {
2909 my ($self) = @_;
2910
2911 delete $::CONN->{on_exp_update}{$self+0}
2912 if $::CONN;
2913
2914 $self->SUPER::DESTROY;
2915}
2916
2917sub set_value {
2918 my ($self, $lvl, $exp) = @_;
2919
2920 $self->{lvl} = $lvl;
2921 $self->{exp} = $exp;
2922
2923 my $v = -1;
2924
2925 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2926 my $l0 = $table->[$lvl - 1];
2927 my $l1 = $table->[$lvl];
2928
2929 $self->{nxt} = $l1;
2930
2931 $v = ($exp - $l0) / ($l1 - $l0);
2932 }
2933
2934 $self->SUPER::set_value ($v);
2935}
2936
2937#############################################################################
2938
2797package CFPlus::UI::Gauge; 2939package CFPlus::UI::Gauge;
2798 2940
2799our @ISA = CFPlus::UI::VBox::; 2941our @ISA = CFPlus::UI::VBox::;
2800 2942
2801sub new { 2943sub new {
… …
3298 3440
3299 if ($y0 < $y + $h && $y < $y1) { 3441 if ($y0 < $y + $h && $y < $y1) {
3300 my $layout = $self->get_layout ($para); 3442 my $layout = $self->get_layout ($para);
3301 3443
3302 $layout->render ($para->{indent}, $y - $y0); 3444 $layout->render ($para->{indent}, $y - $y0);
3445 $layout->draw;
3303 3446
3304 if (my @w = @{ $para->{widget} }) { 3447 if (my @w = @{ $para->{widget} }) {
3305 my @s = $layout->get_shapes; 3448 my @s = $layout->get_shapes;
3306 3449
3307 for (@w) { 3450 for (@w) {
… …
3429} 3572}
3430 3573
3431sub set_tooltip_from { 3574sub set_tooltip_from {
3432 my ($self, $widget) = @_; 3575 my ($self, $widget) = @_;
3433 3576
3434 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3435 if $widget->{tooltip} =~ /^#(.*)$/;
3436
3437 my $tooltip = $widget->{tooltip}; 3577 my $tip = $widget->{tooltip};
3578 $tip = $tip->($widget) if "CODE" eq ref $tip;
3579
3580 $tip = CFPlus::Pod::section_label tooltip => $1
3581 if $tip =~ /^#(.*)$/;
3438 3582
3439 if ($ENV{CFPLUS_DEBUG} & 2) { 3583 if ($ENV{CFPLUS_DEBUG} & 2) {
3440 $tooltip .= "\n\n" . (ref $widget) . "\n" 3584 $tip .= "\n\n" . (ref $widget) . "\n"
3441 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3585 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3442 . "req $widget->{req_w} $widget->{req_h}\n" 3586 . "req $widget->{req_w} $widget->{req_h}\n"
3443 . "visible $widget->{visible}"; 3587 . "visible $widget->{visible}";
3444 } 3588 }
3445 3589
3446 $tooltip =~ s/^\n+//; 3590 $tip =~ s/^\n+//;
3447 $tooltip =~ s/\n+$//; 3591 $tip =~ s/\n+$//;
3448 3592
3449 $self->add (new CFPlus::UI::Label 3593 $self->add (new CFPlus::UI::Label
3450 markup => $tooltip, 3594 markup => $tip,
3451 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3595 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3452 fontsize => 0.8, 3596 fontsize => 0.8,
3453 style => 1, # FLAG_INVERSE 3597 style => 1, # FLAG_INVERSE
3454 ellipsise => 0, 3598 ellipsise => 0,
3455 font => ($widget->{tooltip_font} || $::FONT_PROP), 3599 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3493} 3637}
3494 3638
3495sub _draw { 3639sub _draw {
3496 my ($self) = @_; 3640 my ($self) = @_;
3497 3641
3498 glTranslate 0.375, 0.375;
3499
3500 my ($w, $h) = @$self{qw(w h)}; 3642 my ($w, $h) = @$self{qw(w h)};
3501 3643
3502 glColor 1, 0.8, 0.4; 3644 glColor 1, 0.8, 0.4;
3503 glRect 0, 0, $w, $h; 3645 glRect 0, 0, $w, $h;
3504 3646
3505 glColor 0, 0, 0; 3647 glColor 0, 0, 0;
3506 glBegin GL_LINE_LOOP; 3648 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 3649
3513 glTranslate 2 - 0.375, 2 - 0.375; 3650 glTranslate 2, 2;
3514 3651
3515 $self->SUPER::_draw; 3652 $self->SUPER::_draw;
3516} 3653}
3517 3654
3518############################################################################# 3655#############################################################################
… …
3540 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3677 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3541 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed}; 3678 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3542 $self->{timer} = Event->timer ( 3679 $self->{timer} = Event->timer (
3543 parked => 1, 3680 parked => 1,
3544 cb => sub { 3681 cb => sub {
3545 return unless $::CONN && $widget; 3682 return unless $::CONN;
3546 3683
3684 my $w = $widget
3685 or return;
3686
3547 ++$widget->{frame}; 3687 ++$w->{frame};
3548 $widget->update_face; 3688 $w->update_face;
3689
3690 # somehow, $widget can go away
3549 $widget->update; 3691 $w->update;
3550
3551 $widget->update_timer; 3692 $w->update_timer;
3552 }, 3693 },
3553 ); 3694 );
3554 3695
3555 $self->update_face; 3696 $self->update_face;
3556 $self->update_timer; 3697 $self->update_timer;
… …
3577} 3718}
3578 3719
3579sub update_face { 3720sub update_face {
3580 my ($self) = @_; 3721 my ($self) = @_;
3581 3722
3582 return unless $::CONN; 3723 if ($::CONN) {
3583
3584 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3724 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3585 if ($anim && @$anim) { 3725 if ($anim && @$anim) {
3586 delete $self->{wait_face};
3587 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3726 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3727 delete $self->{face_change_cb};
3728
3588 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]; 3729 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3730 unless ($tex->{name} || $tex->{loading}) {
3731 $tex->upload (sub { $self->reconfigure });
3732 }
3733 }
3734 }
3589 } 3735 }
3590 } 3736 }
3591} 3737}
3592 3738
3593sub size_request { 3739sub size_request {
3594 my ($self) = @_; 3740 my ($self) = @_;
3595 3741
3596 if ($::CONN) { 3742 if ($::CONN) {
3597 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3743 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3598 if (my $tex = $::CONN->{texture}[$faceid]) { 3744 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3599 $self->{tex} = $tex; 3745 if ($tex->{name}) {
3600 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3746 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3601 } else { 3747 } elsif (!$tex->{loading}) {
3602 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3748 $tex->upload (sub { $self->reconfigure });
3603 $self->realloc;
3604 }); 3749 }
3605 } 3750 }
3751
3752 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3606 } 3753 }
3607 } 3754 }
3608 3755
3609 ($self->{size_w} || 8, $self->{size_h} || 8) 3756 ($self->{size_w} || 8, $self->{size_h} || 8)
3610} 3757}
… …
3825 3972
3826############################################################################# 3973#############################################################################
3827 3974
3828package CFPlus::UI::Notebook; 3975package CFPlus::UI::Notebook;
3829 3976
3977use CFPlus::OpenGL;
3978
3830our @ISA = CFPlus::UI::VBox::; 3979our @ISA = CFPlus::UI::VBox::;
3831 3980
3832sub new { 3981sub new {
3833 my $class = shift; 3982 my $class = shift;
3834 3983
3835 my $self = $class->SUPER::new ( 3984 my $self = $class->SUPER::new (
3836 buttonbar => (new CFPlus::UI::Buttonbar), 3985 buttonbar => (new CFPlus::UI::Buttonbar),
3837 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3986 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3987 active_outline => [.7, .7, 0.2],
3838 # filter => # will be put between multiplexer and $self 3988 # filter => # will be put between multiplexer and $self
3839 @_, 3989 @_,
3840 ); 3990 );
3841 3991
3842 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3992 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3916 4066
3917 $self->{multiplexer}->set_current_page ($page); 4067 $self->{multiplexer}->set_current_page ($page);
3918 $self->emit (page_changed => $self->{multiplexer}{current}); 4068 $self->emit (page_changed => $self->{multiplexer}{current});
3919} 4069}
3920 4070
4071sub _draw {
4072 my ($self) = @_;
4073
4074 $self->SUPER::_draw ();
4075
4076 if (my $cur = $self->{multiplexer}{current}) {
4077 if ($cur = $cur->{c_tab_}) {
4078 glTranslate $self->{buttonbar}{x} + $cur->{x},
4079 $self->{buttonbar}{y} + $cur->{y};
4080 glLineWidth 3;
4081 #glEnable GL_BLEND;
4082 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4083 glColor @{$self->{active_outline}};
4084 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4085 glLineWidth 1;
4086 #glDisable GL_BLEND;
4087 }
4088 }
4089}
4090
3921############################################################################# 4091#############################################################################
3922 4092
3923package CFPlus::UI::Selector; 4093package CFPlus::UI::Selector;
3924 4094
3925use utf8; 4095use utf8;
… …
3955} 4125}
3956 4126
3957sub _set_value { 4127sub _set_value {
3958 my ($self, $value) = @_; 4128 my ($self, $value) = @_;
3959 4129
3960 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4130 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4131 $item ||= $self->{options}[0]
3961 or return; 4132 or return;
3962 4133
3963 $self->{value} = $item->[0]; 4134 $self->{value} = $item->[0];
3964 $self->set_markup ("$item->[1] ⇓"); 4135 $self->set_markup ("$item->[1] ⇓");
3965 $self->set_tooltip ($item->[2]); 4136# $self->set_tooltip ($item->[2]);
3966} 4137}
3967 4138
3968sub set_value { 4139sub set_value {
3969 my ($self, $value) = @_; 4140 my ($self, $value) = @_;
3970 4141
3971 return unless $self->{value} ne $value; 4142 return unless $self->{value} ne $value;
3972 4143
3973 $self->_set_value ($value); 4144 $self->_set_value ($value);
3974 $self->emit (changed => $value); 4145 $self->emit (changed => $value);
4146}
4147
4148sub set_options {
4149 my ($self, $options) = @_;
4150
4151 $self->{options} = $options;
4152 $self->_set_value ($self->{value});
3975} 4153}
3976 4154
3977############################################################################# 4155#############################################################################
3978 4156
3979package CFPlus::UI::Statusbox; 4157package CFPlus::UI::Statusbox;
… …
4193} 4371}
4194 4372
4195sub update { 4373sub update {
4196 my ($self) = @_; 4374 my ($self) = @_;
4197 4375
4198 $::WANT_REFRESH++; 4376 $::WANT_REFRESH->start;
4199} 4377}
4200 4378
4201sub add { 4379sub add {
4202 my ($self, @children) = @_; 4380 my ($self, @children) = @_;
4203 4381

Diff Legend

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