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.425 by root, Fri Aug 10 04:02:13 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#############################################################################
… …
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}
… …
2044 : ($self->{w} - $size->[0]) * 0.5); 2025 : ($self->{w} - $size->[0]) * 0.5);
2045 2026
2046 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2047 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2048 : ($self->{h} - $size->[1]) * 0.5); 2029 : ($self->{h} - $size->[1]) * 0.5);
2030
2031 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2049 }; 2032 };
2050 2033
2051# unless ($self->{list}) { 2034# unless ($self->{list}) {
2052# $self->{list} = CFPlus::OpenGL::glGenList; 2035# $self->{list} = CFPlus::OpenGL::glGenList;
2053# CFPlus::OpenGL::glNewList $self->{list}; 2036# CFPlus::OpenGL::glNewList $self->{list};
… …
2055# CFPlus::OpenGL::glEndList; 2038# CFPlus::OpenGL::glEndList;
2056# } 2039# }
2057# 2040#
2058# CFPlus::OpenGL::glCallList $self->{list}; 2041# CFPlus::OpenGL::glCallList $self->{list};
2059 2042
2060 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2043 $self->{layout}->draw;
2061} 2044}
2062 2045
2063#sub destroy { 2046#sub destroy {
2064# my ($self) = @_; 2047# my ($self) = @_;
2065# 2048#
… …
2233 glColor_premultiply @{$self->{bg}}; 2216 glColor_premultiply @{$self->{bg}};
2234 } 2217 }
2235 2218
2236 glEnable GL_BLEND; 2219 glEnable GL_BLEND;
2237 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2220 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}; 2221 glRect 0, 0, $self->{w}, $self->{h};
2242 glVertex $self->{w}, 0;
2243 glEnd;
2244 glDisable GL_BLEND; 2222 glDisable GL_BLEND;
2245 2223
2246 $self->SUPER::_draw; 2224 $self->SUPER::_draw;
2247 2225
2248 #TODO: force update every cursor change :( 2226 #TODO: force update every cursor change :(
… …
2261 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};
2262 glEnd; 2240 glEnd;
2263 2241
2264 glLineWidth 3; 2242 glLineWidth 3;
2265 glColor @{$self->{active_outline}}; 2243 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; 2244 glRect_lineloop 0, 0, $self->{w} - 1, $self->{h} - 1;
2270 glVertex 0, $self->{h} - 1;
2271 glEnd;
2272 glLineWidth 1; 2245 glLineWidth 1;
2273 2246
2274 } else { 2247 } else {
2275 glColor @{$self->{outline}}; 2248 glColor @{$self->{outline}};
2276 glTranslate .375, .375; 2249 glTranslate .375, .375;
… …
2649 align => 0, 2622 align => 0,
2650 valign => 0, 2623 valign => 0,
2651 can_events => 1, 2624 can_events => 1,
2652 @_ 2625 @_
2653 ); 2626 );
2627}
2628
2629sub invoke_button_down {
2630 my ($self, $ev, $x, $y) = @_;
2631
2632 1
2654} 2633}
2655 2634
2656sub invoke_button_up { 2635sub invoke_button_up {
2657 my ($self, $ev, $x, $y) = @_; 2636 my ($self, $ev, $x, $y) = @_;
2658 2637
… …
2798 glDisable GL_TEXTURE_2D; 2777 glDisable GL_TEXTURE_2D;
2799} 2778}
2800 2779
2801############################################################################# 2780#############################################################################
2802 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
2803package CFPlus::UI::Gauge; 2926package CFPlus::UI::Gauge;
2804 2927
2805our @ISA = CFPlus::UI::VBox::; 2928our @ISA = CFPlus::UI::VBox::;
2806 2929
2807sub new { 2930sub new {
… …
3304 3427
3305 if ($y0 < $y + $h && $y < $y1) { 3428 if ($y0 < $y + $h && $y < $y1) {
3306 my $layout = $self->get_layout ($para); 3429 my $layout = $self->get_layout ($para);
3307 3430
3308 $layout->render ($para->{indent}, $y - $y0); 3431 $layout->render ($para->{indent}, $y - $y0);
3432 $layout->draw;
3309 3433
3310 if (my @w = @{ $para->{widget} }) { 3434 if (my @w = @{ $para->{widget} }) {
3311 my @s = $layout->get_shapes; 3435 my @s = $layout->get_shapes;
3312 3436
3313 for (@w) { 3437 for (@w) {
… …
3435} 3559}
3436 3560
3437sub set_tooltip_from { 3561sub set_tooltip_from {
3438 my ($self, $widget) = @_; 3562 my ($self, $widget) = @_;
3439 3563
3440 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3441 if $widget->{tooltip} =~ /^#(.*)$/;
3442
3443 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 =~ /^#(.*)$/;
3444 3569
3445 if ($ENV{CFPLUS_DEBUG} & 2) { 3570 if ($ENV{CFPLUS_DEBUG} & 2) {
3446 $tooltip .= "\n\n" . (ref $widget) . "\n" 3571 $tip .= "\n\n" . (ref $widget) . "\n"
3447 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3572 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3448 . "req $widget->{req_w} $widget->{req_h}\n" 3573 . "req $widget->{req_w} $widget->{req_h}\n"
3449 . "visible $widget->{visible}"; 3574 . "visible $widget->{visible}";
3450 } 3575 }
3451 3576
3452 $tooltip =~ s/^\n+//; 3577 $tip =~ s/^\n+//;
3453 $tooltip =~ s/\n+$//; 3578 $tip =~ s/\n+$//;
3454 3579
3455 $self->add (new CFPlus::UI::Label 3580 $self->add (new CFPlus::UI::Label
3456 markup => $tooltip, 3581 markup => $tip,
3457 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3582 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3458 fontsize => 0.8, 3583 fontsize => 0.8,
3459 style => 1, # FLAG_INVERSE 3584 style => 1, # FLAG_INVERSE
3460 ellipsise => 0, 3585 ellipsise => 0,
3461 font => ($widget->{tooltip_font} || $::FONT_PROP), 3586 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3507 3632
3508 glColor 1, 0.8, 0.4; 3633 glColor 1, 0.8, 0.4;
3509 glRect 0, 0, $w, $h; 3634 glRect 0, 0, $w, $h;
3510 3635
3511 glColor 0, 0, 0; 3636 glColor 0, 0, 0;
3512 glBegin GL_LINE_LOOP; 3637 glRect_lineloop 0, 0, $w, $h;
3513 glVertex 0 , 0;
3514 glVertex 0 , $h;
3515 glVertex $w, $h;
3516 glVertex $w, 0;
3517 glEnd;
3518 3638
3519 glTranslate 2 - 0.375, 2 - 0.375; 3639 glTranslate 2 - 0.375, 2 - 0.375;
3520 3640
3521 $self->SUPER::_draw; 3641 $self->SUPER::_draw;
3522} 3642}
… …
3546 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3666 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3547 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed}; 3667 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3548 $self->{timer} = Event->timer ( 3668 $self->{timer} = Event->timer (
3549 parked => 1, 3669 parked => 1,
3550 cb => sub { 3670 cb => sub {
3551 return unless $::CONN && $widget; 3671 return unless $::CONN;
3552 3672
3673 my $w = $widget
3674 or return;
3675
3553 ++$widget->{frame}; 3676 ++$w->{frame};
3554 $widget->update_face; 3677 $w->update_face;
3678
3679 # somehow, $widget can go away
3555 $widget->update; 3680 $w->update;
3556
3557 $widget->update_timer; 3681 $w->update_timer;
3558 }, 3682 },
3559 ); 3683 );
3560 3684
3561 $self->update_face; 3685 $self->update_face;
3562 $self->update_timer; 3686 $self->update_timer;
… …
3583} 3707}
3584 3708
3585sub update_face { 3709sub update_face {
3586 my ($self) = @_; 3710 my ($self) = @_;
3587 3711
3588 return unless $::CONN; 3712 if ($::CONN) {
3589
3590 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3713 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3591 if ($anim && @$anim) { 3714 if ($anim && @$anim) {
3592 delete $self->{wait_face};
3593 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3715 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3716 delete $self->{face_change_cb};
3717
3594 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]) { 3718 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3595 unless ($tex->{name} || $tex->{loading}) { 3719 unless ($tex->{name} || $tex->{loading}) {
3596 $tex->upload (sub { $self->reconfigure }); 3720 $tex->upload (sub { $self->reconfigure });
3721 }
3597 } 3722 }
3598 } 3723 }
3599 } 3724 }
3600 } 3725 }
3601} 3726}
3602 3727
3603sub size_request { 3728sub size_request {
3604 my ($self) = @_; 3729 my ($self) = @_;
3605 3730
3606 if ($::CONN) { 3731 if ($::CONN) {
3607 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3732 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3608 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) { 3733 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3609 if ($tex->{name}) { 3734 if ($tex->{name}) {
3610 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3735 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3611 } elsif (!$tex->{loading}) { 3736 } elsif (!$tex->{loading}) {
3612 $tex->upload (sub { $self->reconfigure }); 3737 $tex->upload (sub { $self->reconfigure });
3613 } 3738 }
3614 } else {
3615 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3616 $self->reconfigure;
3617 });
3618 } 3739 }
3740
3741 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3619 } 3742 }
3620 } 3743 }
3621 3744
3622 ($self->{size_w} || 8, $self->{size_h} || 8) 3745 ($self->{size_w} || 8, $self->{size_h} || 8)
3623} 3746}
… …
3838 3961
3839############################################################################# 3962#############################################################################
3840 3963
3841package CFPlus::UI::Notebook; 3964package CFPlus::UI::Notebook;
3842 3965
3966use CFPlus::OpenGL;
3967
3843our @ISA = CFPlus::UI::VBox::; 3968our @ISA = CFPlus::UI::VBox::;
3844 3969
3845sub new { 3970sub new {
3846 my $class = shift; 3971 my $class = shift;
3847 3972
3848 my $self = $class->SUPER::new ( 3973 my $self = $class->SUPER::new (
3849 buttonbar => (new CFPlus::UI::Buttonbar), 3974 buttonbar => (new CFPlus::UI::Buttonbar),
3850 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3975 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3976 active_outline => [1, 1, 0],
3851 # filter => # will be put between multiplexer and $self 3977 # filter => # will be put between multiplexer and $self
3852 @_, 3978 @_,
3853 ); 3979 );
3854 3980
3855 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3981 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3927sub set_current_page { 4053sub set_current_page {
3928 my ($self, $page) = @_; 4054 my ($self, $page) = @_;
3929 4055
3930 $self->{multiplexer}->set_current_page ($page); 4056 $self->{multiplexer}->set_current_page ($page);
3931 $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 }
3932} 4074}
3933 4075
3934############################################################################# 4076#############################################################################
3935 4077
3936package CFPlus::UI::Selector; 4078package CFPlus::UI::Selector;

Diff Legend

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