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.428 by root, Mon Aug 20 19:24:22 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#############################################################################
… …
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}
… …
2235 glColor_premultiply @{$self->{bg}}; 2216 glColor_premultiply @{$self->{bg}};
2236 } 2217 }
2237 2218
2238 glEnable GL_BLEND; 2219 glEnable GL_BLEND;
2239 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2220 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2240 glBegin GL_QUADS;
2241 glVertex 0 , 0;
2242 glVertex 0 , $self->{h};
2243 glVertex $self->{w}, $self->{h}; 2221 glRect 0, 0, $self->{w}, $self->{h};
2244 glVertex $self->{w}, 0;
2245 glEnd;
2246 glDisable GL_BLEND; 2222 glDisable GL_BLEND;
2247 2223
2248 $self->SUPER::_draw; 2224 $self->SUPER::_draw;
2249 2225
2250 #TODO: force update every cursor change :( 2226 #TODO: force update every cursor change :(
… …
2257 @$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);
2258 } 2234 }
2259 2235
2260 glColor_premultiply @{$self->{active_fg}}; 2236 glColor_premultiply @{$self->{active_fg}};
2261 glBegin GL_LINES; 2237 glBegin GL_LINES;
2262 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};
2263 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};
2264 glEnd; 2240 glEnd;
2265 2241
2266 glLineWidth 3; 2242 glLineWidth 3;
2267 glColor @{$self->{active_outline}}; 2243 glColor @{$self->{active_outline}};
2268 glBegin GL_LINE_LOOP;
2269 glVertex 0, 0;
2270 glVertex $self->{w} - 1, 0;
2271 glVertex $self->{w} - 1, $self->{h} - 1; 2244 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2272 glVertex 0, $self->{h} - 1;
2273 glEnd;
2274 glLineWidth 1; 2245 glLineWidth 1;
2275 2246
2276 } else { 2247 } else {
2277 glColor @{$self->{outline}}; 2248 glColor @{$self->{outline}};
2278 glTranslate .375, .375;
2279 glBegin GL_LINE_STRIP; 2249 glBegin GL_LINE_STRIP;
2280 glVertex 0, $self->{h} * .5; 2250 glVertex .5, $self->{h} * .5;
2281 glVertex 0, $self->{h} - 3; 2251 glVertex .5, $self->{h} - 2.5;
2282 glVertex $self->{w} - 1, $self->{h} - 3; 2252 glVertex $self->{w} - .5, $self->{h} - 2.5;
2283 glVertex $self->{w} - 1, $self->{h} * .5; 2253 glVertex $self->{w} - .5, $self->{h} * .5;
2284 glEnd; 2254 glEnd;
2285 } 2255 }
2286} 2256}
2287 2257
2288############################################################################# 2258#############################################################################
… …
2537sub _draw { 2507sub _draw {
2538 my ($self) = @_; 2508 my ($self) = @_;
2539 2509
2540 $self->SUPER::_draw; 2510 $self->SUPER::_draw;
2541 2511
2542 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2512 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2543 2513
2544 my ($w, $h) = @$self{qw(w h)}; 2514 my ($w, $h) = @$self{qw(w h)};
2545 2515
2546 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;
2547 2517
… …
2806 glDisable GL_TEXTURE_2D; 2776 glDisable GL_TEXTURE_2D;
2807} 2777}
2808 2778
2809############################################################################# 2779#############################################################################
2810 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
2811package CFPlus::UI::Gauge; 2919package CFPlus::UI::Gauge;
2812 2920
2813our @ISA = CFPlus::UI::VBox::; 2921our @ISA = CFPlus::UI::VBox::;
2814 2922
2815sub new { 2923sub new {
… …
3444} 3552}
3445 3553
3446sub set_tooltip_from { 3554sub set_tooltip_from {
3447 my ($self, $widget) = @_; 3555 my ($self, $widget) = @_;
3448 3556
3449 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3450 if $widget->{tooltip} =~ /^#(.*)$/;
3451
3452 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 =~ /^#(.*)$/;
3453 3562
3454 if ($ENV{CFPLUS_DEBUG} & 2) { 3563 if ($ENV{CFPLUS_DEBUG} & 2) {
3455 $tooltip .= "\n\n" . (ref $widget) . "\n" 3564 $tip .= "\n\n" . (ref $widget) . "\n"
3456 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3565 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3457 . "req $widget->{req_w} $widget->{req_h}\n" 3566 . "req $widget->{req_w} $widget->{req_h}\n"
3458 . "visible $widget->{visible}"; 3567 . "visible $widget->{visible}";
3459 } 3568 }
3460 3569
3461 $tooltip =~ s/^\n+//; 3570 $tip =~ s/^\n+//;
3462 $tooltip =~ s/\n+$//; 3571 $tip =~ s/\n+$//;
3463 3572
3464 $self->add (new CFPlus::UI::Label 3573 $self->add (new CFPlus::UI::Label
3465 markup => $tooltip, 3574 markup => $tip,
3466 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3575 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3467 fontsize => 0.8, 3576 fontsize => 0.8,
3468 style => 1, # FLAG_INVERSE 3577 style => 1, # FLAG_INVERSE
3469 ellipsise => 0, 3578 ellipsise => 0,
3470 font => ($widget->{tooltip_font} || $::FONT_PROP), 3579 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3508} 3617}
3509 3618
3510sub _draw { 3619sub _draw {
3511 my ($self) = @_; 3620 my ($self) = @_;
3512 3621
3513 glTranslate 0.375, 0.375;
3514
3515 my ($w, $h) = @$self{qw(w h)}; 3622 my ($w, $h) = @$self{qw(w h)};
3516 3623
3517 glColor 1, 0.8, 0.4; 3624 glColor 1, 0.8, 0.4;
3518 glRect 0, 0, $w, $h; 3625 glRect 0, 0, $w, $h;
3519 3626
3520 glColor 0, 0, 0; 3627 glColor 0, 0, 0;
3521 glBegin GL_LINE_LOOP; 3628 glRect_lineloop .5, .5, $w + .5, $h + .5;
3522 glVertex 0 , 0;
3523 glVertex 0 , $h;
3524 glVertex $w, $h;
3525 glVertex $w, 0;
3526 glEnd;
3527 3629
3528 glTranslate 2 - 0.375, 2 - 0.375; 3630 glTranslate 2, 2;
3529 3631
3530 $self->SUPER::_draw; 3632 $self->SUPER::_draw;
3531} 3633}
3532 3634
3533############################################################################# 3635#############################################################################
… …
3596} 3698}
3597 3699
3598sub update_face { 3700sub update_face {
3599 my ($self) = @_; 3701 my ($self) = @_;
3600 3702
3601 return unless $::CONN; 3703 if ($::CONN) {
3602
3603 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3704 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3604 if ($anim && @$anim) { 3705 if ($anim && @$anim) {
3605 delete $self->{wait_face};
3606 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3706 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3707 delete $self->{face_change_cb};
3708
3607 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]) { 3709 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3608 unless ($tex->{name} || $tex->{loading}) { 3710 unless ($tex->{name} || $tex->{loading}) {
3609 $tex->upload (sub { $self->reconfigure }); 3711 $tex->upload (sub { $self->reconfigure });
3712 }
3610 } 3713 }
3611 } 3714 }
3612 } 3715 }
3613 } 3716 }
3614} 3717}
3615 3718
3616sub size_request { 3719sub size_request {
3617 my ($self) = @_; 3720 my ($self) = @_;
3618 3721
3619 if ($::CONN) { 3722 if ($::CONN) {
3620 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3723 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3621 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) { 3724 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3622 if ($tex->{name}) { 3725 if ($tex->{name}) {
3623 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3726 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3624 } elsif (!$tex->{loading}) { 3727 } elsif (!$tex->{loading}) {
3625 $tex->upload (sub { $self->reconfigure }); 3728 $tex->upload (sub { $self->reconfigure });
3626 } 3729 }
3627 } else {
3628 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3629 $self->reconfigure;
3630 });
3631 } 3730 }
3731
3732 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3632 } 3733 }
3633 } 3734 }
3634 3735
3635 ($self->{size_w} || 8, $self->{size_h} || 8) 3736 ($self->{size_w} || 8, $self->{size_h} || 8)
3636} 3737}
… …
3851 3952
3852############################################################################# 3953#############################################################################
3853 3954
3854package CFPlus::UI::Notebook; 3955package CFPlus::UI::Notebook;
3855 3956
3957use CFPlus::OpenGL;
3958
3856our @ISA = CFPlus::UI::VBox::; 3959our @ISA = CFPlus::UI::VBox::;
3857 3960
3858sub new { 3961sub new {
3859 my $class = shift; 3962 my $class = shift;
3860 3963
3861 my $self = $class->SUPER::new ( 3964 my $self = $class->SUPER::new (
3862 buttonbar => (new CFPlus::UI::Buttonbar), 3965 buttonbar => (new CFPlus::UI::Buttonbar),
3863 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3966 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3967 active_outline => [.7, .7, 0.2],
3864 # filter => # will be put between multiplexer and $self 3968 # filter => # will be put between multiplexer and $self
3865 @_, 3969 @_,
3866 ); 3970 );
3867 3971
3868 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3972 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3940sub set_current_page { 4044sub set_current_page {
3941 my ($self, $page) = @_; 4045 my ($self, $page) = @_;
3942 4046
3943 $self->{multiplexer}->set_current_page ($page); 4047 $self->{multiplexer}->set_current_page ($page);
3944 $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 }
3945} 4069}
3946 4070
3947############################################################################# 4071#############################################################################
3948 4072
3949package CFPlus::UI::Selector; 4073package CFPlus::UI::Selector;

Diff Legend

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