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.424 by root, Mon Aug 6 05:31:12 2007 UTC vs.
Revision 1.439 by root, Sun Sep 16 13:04:36 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# travsle the widget chain up to find the maximum "physical" size constraints
366sub get_max_wh {
367 my ($self) = @_;
368
369 return ($self->{alloc_w}, $self->{alloc_h})
370 if $self->{alloc_w} && !$self->{root}{realloc}{$self+0};
371
372 return $self->{parent}->get_max_wh
373 if $self->{parent};
374
375 ($::WIDTH, $::HEIGHT)
367} 376}
368 377
369sub size_request { 378sub size_request {
370 require Carp; 379 require Carp;
371 Carp::confess "size_request is abstract"; 380 Carp::confess "size_request is abstract";
… …
607sub DESTROY { 616sub DESTROY {
608 my ($self) = @_; 617 my ($self) = @_;
609 618
610 return if CFPlus::in_destruct; 619 return if CFPlus::in_destruct;
611 620
621 local $@;
612 eval { $self->destroy }; 622 eval { $self->destroy };
613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 623 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614 624
615 delete $WIDGET{$self+0}; 625 delete $WIDGET{$self+0};
616} 626}
… …
624use strict; 634use strict;
625use CFPlus::OpenGL; 635use CFPlus::OpenGL;
626 636
627sub new { 637sub new {
628 my $class = shift; 638 my $class = shift;
629
630 # range [value, low, high, page]
631 639
632 $class->SUPER::new ( 640 $class->SUPER::new (
633 #bg => [0, 0, 0, 0.2], 641 #bg => [0, 0, 0, 0.2],
634 #active_bg => [1, 1, 1, 0.5], 642 #active_bg => [1, 1, 1, 0.5],
635 @_ 643 @_
… …
647 my ($w, $h) = @$self{qw(w h)}; 655 my ($w, $h) = @$self{qw(w h)};
648 656
649 glEnable GL_BLEND; 657 glEnable GL_BLEND;
650 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 658 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
651 glColor_premultiply @$color; 659 glColor_premultiply @$color;
652
653 glBegin GL_QUADS;
654 glVertex 0 , 0;
655 glVertex 0 , $h;
656 glVertex $w, $h; 660 glRect 0, 0, $w, $h;
657 glVertex $w, 0;
658 glEnd;
659
660 glDisable GL_BLEND; 661 glDisable GL_BLEND;
661 } 662 }
662} 663}
663 664
664############################################################################# 665#############################################################################
… …
829 830
830 1 831 1
831} 832}
832 833
833############################################################################# 834#############################################################################
834
835# back-buffered drawing area 835# back-buffered drawing area
836 836
837package CFPlus::UI::Window; 837package CFPlus::UI::Window;
838 838
839our @ISA = CFPlus::UI::Bin::; 839our @ISA = CFPlus::UI::Bin::;
… …
1219 my ($w, $h) = @$self{qw(w h)}; 1219 my ($w, $h) = @$self{qw(w h)};
1220 1220
1221 glEnable GL_BLEND; 1221 glEnable GL_BLEND;
1222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1223 glColor_premultiply @{ $self->{bg} }; 1223 glColor_premultiply @{ $self->{bg} };
1224
1225 glBegin GL_QUADS;
1226 glVertex 0 , 0;
1227 glVertex 0 , $h;
1228 glVertex $w, $h; 1224 glRect 0, 0, $w, $h;
1229 glVertex $w, 0;
1230 glEnd;
1231
1232 glDisable GL_BLEND; 1225 glDisable GL_BLEND;
1233 } 1226 }
1234 1227
1235 $self->SUPER::_draw; 1228 $self->SUPER::_draw;
1236} 1229}
… …
1961 1954
1962sub size_request { 1955sub size_request {
1963 my ($self) = @_; 1956 my ($self) = @_;
1964 1957
1965 $self->{size_req} ||= do { 1958 $self->{size_req} ||= do {
1959 my ($max_w, $max_h) = $self->get_max_wh;
1960
1966 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1961 $self->{layout}->set_font ($self->{font}) if $self->{font};
1967 $self->{layout}->set_width ($self->{max_w} || -1); 1962 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1968 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1963 $self->{layout}->set_ellipsise ($self->{ellipsise});
1969 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1964 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1970 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1965 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1971 1966
1972 my ($w, $h) = $self->{layout}->size; 1967 my ($w, $h) = $self->{layout}->size;
… …
2044 : ($self->{w} - $size->[0]) * 0.5); 2039 : ($self->{w} - $size->[0]) * 0.5);
2045 2040
2046 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2041 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2047 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2042 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2048 : ($self->{h} - $size->[1]) * 0.5); 2043 : ($self->{h} - $size->[1]) * 0.5);
2044
2045 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2049 }; 2046 };
2050 2047
2051# unless ($self->{list}) { 2048# unless ($self->{list}) {
2052# $self->{list} = CFPlus::OpenGL::glGenList; 2049# $self->{list} = CFPlus::OpenGL::glGenList;
2053# CFPlus::OpenGL::glNewList $self->{list}; 2050# CFPlus::OpenGL::glNewList $self->{list};
… …
2055# CFPlus::OpenGL::glEndList; 2052# CFPlus::OpenGL::glEndList;
2056# } 2053# }
2057# 2054#
2058# CFPlus::OpenGL::glCallList $self->{list}; 2055# CFPlus::OpenGL::glCallList $self->{list};
2059 2056
2060 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2057 $self->{layout}->draw;
2061} 2058}
2062 2059
2063#sub destroy { 2060#sub destroy {
2064# my ($self) = @_; 2061# my ($self) = @_;
2065# 2062#
… …
2233 glColor_premultiply @{$self->{bg}}; 2230 glColor_premultiply @{$self->{bg}};
2234 } 2231 }
2235 2232
2236 glEnable GL_BLEND; 2233 glEnable GL_BLEND;
2237 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2234 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2238 glBegin GL_QUADS;
2239 glVertex 0 , 0;
2240 glVertex 0 , $self->{h};
2241 glVertex $self->{w}, $self->{h}; 2235 glRect 0, 0, $self->{w}, $self->{h};
2242 glVertex $self->{w}, 0;
2243 glEnd;
2244 glDisable GL_BLEND; 2236 glDisable GL_BLEND;
2245 2237
2246 $self->SUPER::_draw; 2238 $self->SUPER::_draw;
2247 2239
2248 #TODO: force update every cursor change :( 2240 #TODO: force update every cursor change :(
… …
2255 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); 2247 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2256 } 2248 }
2257 2249
2258 glColor_premultiply @{$self->{active_fg}}; 2250 glColor_premultiply @{$self->{active_fg}};
2259 glBegin GL_LINES; 2251 glBegin GL_LINES;
2260 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2252 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2261 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2253 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2262 glEnd; 2254 glEnd;
2263 2255
2264 glLineWidth 3; 2256 glLineWidth 3;
2265 glColor @{$self->{active_outline}}; 2257 glColor @{$self->{active_outline}};
2266 glBegin GL_LINE_LOOP;
2267 glVertex 0, 0;
2268 glVertex $self->{w} - 1, 0;
2269 glVertex $self->{w} - 1, $self->{h} - 1; 2258 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2270 glVertex 0, $self->{h} - 1;
2271 glEnd;
2272 glLineWidth 1; 2259 glLineWidth 1;
2273 2260
2274 } else { 2261 } else {
2275 glColor @{$self->{outline}}; 2262 glColor @{$self->{outline}};
2276 glTranslate .375, .375;
2277 glBegin GL_LINE_STRIP; 2263 glBegin GL_LINE_STRIP;
2278 glVertex 0, $self->{h} * .5; 2264 glVertex .5, $self->{h} * .5;
2279 glVertex 0, $self->{h} - 3; 2265 glVertex .5, $self->{h} - 2.5;
2280 glVertex $self->{w} - 1, $self->{h} - 3; 2266 glVertex $self->{w} - .5, $self->{h} - 2.5;
2281 glVertex $self->{w} - 1, $self->{h} * .5; 2267 glVertex $self->{w} - .5, $self->{h} * .5;
2282 glEnd; 2268 glEnd;
2283 } 2269 }
2284} 2270}
2285 2271
2286############################################################################# 2272#############################################################################
… …
2535sub _draw { 2521sub _draw {
2536 my ($self) = @_; 2522 my ($self) = @_;
2537 2523
2538 $self->SUPER::_draw; 2524 $self->SUPER::_draw;
2539 2525
2540 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2526 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2541 2527
2542 my ($w, $h) = @$self{qw(w h)}; 2528 my ($w, $h) = @$self{qw(w h)};
2543 2529
2544 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2530 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2545 2531
… …
2649 align => 0, 2635 align => 0,
2650 valign => 0, 2636 valign => 0,
2651 can_events => 1, 2637 can_events => 1,
2652 @_ 2638 @_
2653 ); 2639 );
2640}
2641
2642sub invoke_button_down {
2643 my ($self, $ev, $x, $y) = @_;
2644
2645 1
2654} 2646}
2655 2647
2656sub invoke_button_up { 2648sub invoke_button_up {
2657 my ($self, $ev, $x, $y) = @_; 2649 my ($self, $ev, $x, $y) = @_;
2658 2650
… …
2798 glDisable GL_TEXTURE_2D; 2790 glDisable GL_TEXTURE_2D;
2799} 2791}
2800 2792
2801############################################################################# 2793#############################################################################
2802 2794
2795package CFPlus::UI::Progress;
2796
2797our @ISA = CFPlus::UI::Label::;
2798
2799use CFPlus::OpenGL;
2800
2801sub new {
2802 my ($class, %arg) = @_;
2803
2804 my $self = $class->SUPER::new (
2805 fg => [1, 1, 1],
2806 bg => [0, 0, 1, 0.2],
2807 bar => [0.7, 0.5, 0.1, 0.8],
2808 outline => [0.4, 0.3, 0],
2809 fontsize => 0.9,
2810 valign => 0,
2811 align => 0,
2812 can_events => 1,
2813 ellipsise => 1,
2814 label => "%d%%",
2815 %arg,
2816 );
2817
2818 $self->set_value ($arg{value} || -1);
2819
2820 $self
2821}
2822
2823sub set_label {
2824 my ($self, $label) = @_;
2825
2826 return if $self->{label} eq $label;
2827 $self->{label} = $label;
2828
2829 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2830}
2831
2832sub set_value {
2833 my ($self, $value) = @_;
2834
2835 if ($self->{value} ne $value) {
2836 $self->{value} = $value;
2837
2838 if ($value < 0) {
2839 $self->set_text ("-");
2840 } else {
2841 $self->set_text (sprintf $self->{label}, $value * 100);
2842 }
2843
2844 $self->update;
2845 }
2846}
2847
2848sub _draw {
2849 my ($self) = @_;
2850
2851 glEnable GL_BLEND;
2852 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2853
2854 if ($self->{value} >= 0) {
2855 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2856
2857 glColor_premultiply @{$self->{bar}};
2858 glRect 2, 2, $s, $self->{h} - 2;
2859 glColor_premultiply @{$self->{bg}};
2860 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2861 }
2862
2863 glColor_premultiply @{$self->{outline}};
2864 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2865
2866 glDisable GL_BLEND;
2867
2868 {
2869 local $self->{bg}; # do not draw background
2870 $self->SUPER::_draw;
2871 }
2872}
2873
2874#############################################################################
2875
2876package CFPlus::UI::ExperienceProgress;
2877
2878our @ISA = CFPlus::UI::Progress::;
2879
2880sub new {
2881 my ($class, %arg) = @_;
2882
2883 my $self = $class->SUPER::new (
2884 tooltip => sub {
2885 my ($self) = @_;
2886
2887 sprintf "level %d\n%s points\n%s next level\n%s to go",
2888 $self->{lvl},
2889 ::formsep ($self->{exp}),
2890 ::formsep ($self->{nxt}),
2891 ::formsep ($self->{nxt} - $self->{exp}),
2892 },
2893 %arg
2894 );
2895
2896 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2897 if $::CONN;
2898
2899 $self
2900}
2901
2902sub DESTROY {
2903 my ($self) = @_;
2904
2905 delete $::CONN->{on_exp_update}{$self+0}
2906 if $::CONN;
2907
2908 $self->SUPER::DESTROY;
2909}
2910
2911sub set_value {
2912 my ($self, $lvl, $exp) = @_;
2913
2914 $self->{lvl} = $lvl;
2915 $self->{exp} = $exp;
2916
2917 my $v = -1;
2918
2919 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2920 my $l0 = $table->[$lvl - 1];
2921 my $l1 = $table->[$lvl];
2922
2923 $self->{nxt} = $l1;
2924
2925 $v = ($exp - $l0) / ($l1 - $l0);
2926 }
2927
2928 $self->SUPER::set_value ($v);
2929}
2930
2931#############################################################################
2932
2803package CFPlus::UI::Gauge; 2933package CFPlus::UI::Gauge;
2804 2934
2805our @ISA = CFPlus::UI::VBox::; 2935our @ISA = CFPlus::UI::VBox::;
2806 2936
2807sub new { 2937sub new {
… …
3304 3434
3305 if ($y0 < $y + $h && $y < $y1) { 3435 if ($y0 < $y + $h && $y < $y1) {
3306 my $layout = $self->get_layout ($para); 3436 my $layout = $self->get_layout ($para);
3307 3437
3308 $layout->render ($para->{indent}, $y - $y0); 3438 $layout->render ($para->{indent}, $y - $y0);
3439 $layout->draw;
3309 3440
3310 if (my @w = @{ $para->{widget} }) { 3441 if (my @w = @{ $para->{widget} }) {
3311 my @s = $layout->get_shapes; 3442 my @s = $layout->get_shapes;
3312 3443
3313 for (@w) { 3444 for (@w) {
… …
3435} 3566}
3436 3567
3437sub set_tooltip_from { 3568sub set_tooltip_from {
3438 my ($self, $widget) = @_; 3569 my ($self, $widget) = @_;
3439 3570
3440 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3441 if $widget->{tooltip} =~ /^#(.*)$/;
3442
3443 my $tooltip = $widget->{tooltip}; 3571 my $tip = $widget->{tooltip};
3572 $tip = $tip->($widget) if "CODE" eq ref $tip;
3573
3574 $tip = CFPlus::Pod::section_label tooltip => $1
3575 if $tip =~ /^#(.*)$/;
3444 3576
3445 if ($ENV{CFPLUS_DEBUG} & 2) { 3577 if ($ENV{CFPLUS_DEBUG} & 2) {
3446 $tooltip .= "\n\n" . (ref $widget) . "\n" 3578 $tip .= "\n\n" . (ref $widget) . "\n"
3447 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3579 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3448 . "req $widget->{req_w} $widget->{req_h}\n" 3580 . "req $widget->{req_w} $widget->{req_h}\n"
3449 . "visible $widget->{visible}"; 3581 . "visible $widget->{visible}";
3450 } 3582 }
3451 3583
3452 $tooltip =~ s/^\n+//; 3584 $tip =~ s/^\n+//;
3453 $tooltip =~ s/\n+$//; 3585 $tip =~ s/\n+$//;
3454 3586
3455 $self->add (new CFPlus::UI::Label 3587 $self->add (new CFPlus::UI::Label
3456 markup => $tooltip, 3588 markup => $tip,
3457 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3589 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3458 fontsize => 0.8, 3590 fontsize => 0.8,
3459 style => 1, # FLAG_INVERSE 3591 style => 1, # FLAG_INVERSE
3460 ellipsise => 0, 3592 ellipsise => 0,
3461 font => ($widget->{tooltip_font} || $::FONT_PROP), 3593 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3499} 3631}
3500 3632
3501sub _draw { 3633sub _draw {
3502 my ($self) = @_; 3634 my ($self) = @_;
3503 3635
3504 glTranslate 0.375, 0.375;
3505
3506 my ($w, $h) = @$self{qw(w h)}; 3636 my ($w, $h) = @$self{qw(w h)};
3507 3637
3508 glColor 1, 0.8, 0.4; 3638 glColor 1, 0.8, 0.4;
3509 glRect 0, 0, $w, $h; 3639 glRect 0, 0, $w, $h;
3510 3640
3511 glColor 0, 0, 0; 3641 glColor 0, 0, 0;
3512 glBegin GL_LINE_LOOP; 3642 glRect_lineloop .5, .5, $w + .5, $h + .5;
3513 glVertex 0 , 0;
3514 glVertex 0 , $h;
3515 glVertex $w, $h;
3516 glVertex $w, 0;
3517 glEnd;
3518 3643
3519 glTranslate 2 - 0.375, 2 - 0.375; 3644 glTranslate 2, 2;
3520 3645
3521 $self->SUPER::_draw; 3646 $self->SUPER::_draw;
3522} 3647}
3523 3648
3524############################################################################# 3649#############################################################################
… …
3546 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3671 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3547 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed}; 3672 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3548 $self->{timer} = Event->timer ( 3673 $self->{timer} = Event->timer (
3549 parked => 1, 3674 parked => 1,
3550 cb => sub { 3675 cb => sub {
3551 return unless $::CONN && $widget; 3676 return unless $::CONN;
3552 3677
3678 my $w = $widget
3679 or return;
3680
3553 ++$widget->{frame}; 3681 ++$w->{frame};
3554 $widget->update_face; 3682 $w->update_face;
3683
3684 # somehow, $widget can go away
3555 $widget->update; 3685 $w->update;
3556
3557 $widget->update_timer; 3686 $w->update_timer;
3558 }, 3687 },
3559 ); 3688 );
3560 3689
3561 $self->update_face; 3690 $self->update_face;
3562 $self->update_timer; 3691 $self->update_timer;
… …
3583} 3712}
3584 3713
3585sub update_face { 3714sub update_face {
3586 my ($self) = @_; 3715 my ($self) = @_;
3587 3716
3588 return unless $::CONN; 3717 if ($::CONN) {
3589
3590 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3718 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3591 if ($anim && @$anim) { 3719 if ($anim && @$anim) {
3592 delete $self->{wait_face};
3593 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3720 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3721 delete $self->{face_change_cb};
3722
3594 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]) { 3723 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3595 unless ($tex->{name} || $tex->{loading}) { 3724 unless ($tex->{name} || $tex->{loading}) {
3596 $tex->upload (sub { $self->reconfigure }); 3725 $tex->upload (sub { $self->reconfigure });
3726 }
3597 } 3727 }
3598 } 3728 }
3599 } 3729 }
3600 } 3730 }
3601} 3731}
3602 3732
3603sub size_request { 3733sub size_request {
3604 my ($self) = @_; 3734 my ($self) = @_;
3605 3735
3606 if ($::CONN) { 3736 if ($::CONN) {
3607 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3737 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3608 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) { 3738 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3609 if ($tex->{name}) { 3739 if ($tex->{name}) {
3610 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3740 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3611 } elsif (!$tex->{loading}) { 3741 } elsif (!$tex->{loading}) {
3612 $tex->upload (sub { $self->reconfigure }); 3742 $tex->upload (sub { $self->reconfigure });
3613 } 3743 }
3614 } else {
3615 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3616 $self->reconfigure;
3617 });
3618 } 3744 }
3745
3746 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3619 } 3747 }
3620 } 3748 }
3621 3749
3622 ($self->{size_w} || 8, $self->{size_h} || 8) 3750 ($self->{size_w} || 8, $self->{size_h} || 8)
3623} 3751}
… …
3838 3966
3839############################################################################# 3967#############################################################################
3840 3968
3841package CFPlus::UI::Notebook; 3969package CFPlus::UI::Notebook;
3842 3970
3971use CFPlus::OpenGL;
3972
3843our @ISA = CFPlus::UI::VBox::; 3973our @ISA = CFPlus::UI::VBox::;
3844 3974
3845sub new { 3975sub new {
3846 my $class = shift; 3976 my $class = shift;
3847 3977
3848 my $self = $class->SUPER::new ( 3978 my $self = $class->SUPER::new (
3849 buttonbar => (new CFPlus::UI::Buttonbar), 3979 buttonbar => (new CFPlus::UI::Buttonbar),
3850 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3980 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3981 active_outline => [.7, .7, 0.2],
3851 # filter => # will be put between multiplexer and $self 3982 # filter => # will be put between multiplexer and $self
3852 @_, 3983 @_,
3853 ); 3984 );
3854 3985
3855 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3986 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3927sub set_current_page { 4058sub set_current_page {
3928 my ($self, $page) = @_; 4059 my ($self, $page) = @_;
3929 4060
3930 $self->{multiplexer}->set_current_page ($page); 4061 $self->{multiplexer}->set_current_page ($page);
3931 $self->emit (page_changed => $self->{multiplexer}{current}); 4062 $self->emit (page_changed => $self->{multiplexer}{current});
4063}
4064
4065sub _draw {
4066 my ($self) = @_;
4067
4068 $self->SUPER::_draw ();
4069
4070 if (my $cur = $self->{multiplexer}{current}) {
4071 if ($cur = $cur->{c_tab_}) {
4072 glTranslate $self->{buttonbar}{x} + $cur->{x},
4073 $self->{buttonbar}{y} + $cur->{y};
4074 glLineWidth 3;
4075 #glEnable GL_BLEND;
4076 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4077 glColor @{$self->{active_outline}};
4078 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4079 glLineWidth 1;
4080 #glDisable GL_BLEND;
4081 }
4082 }
3932} 4083}
3933 4084
3934############################################################################# 4085#############################################################################
3935 4086
3936package CFPlus::UI::Selector; 4087package CFPlus::UI::Selector;
… …
4206} 4357}
4207 4358
4208sub update { 4359sub update {
4209 my ($self) = @_; 4360 my ($self) = @_;
4210 4361
4211 $::WANT_REFRESH++; 4362 $::WANT_REFRESH->start;
4212} 4363}
4213 4364
4214sub add { 4365sub add {
4215 my ($self, @children) = @_; 4366 my ($self, @children) = @_;
4216 4367

Diff Legend

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