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.470 by root, Fri Sep 19 02:24:32 2008 UTC vs.
Revision 1.477 by root, Sun Jan 11 23:50:27 2009 UTC

… …
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use List::Util (); 6use List::Util ();
7
8use Guard ();
7 9
8use DC; 10use DC;
9use DC::Pod; 11use DC::Pod;
10use DC::Texture; 12use DC::Texture;
11 13
… …
189# call when resolution changes etc. 191# call when resolution changes etc.
190sub rescale_widgets { 192sub rescale_widgets {
191 my ($sx, $sy) = @_; 193 my ($sx, $sy) = @_;
192 194
193 for my $widget (values %WIDGET) { 195 for my $widget (values %WIDGET) {
194 if ($widget->{is_toplevel}) { 196 if ($widget->{is_toplevel} || $widget->{c_rescale}) {
195 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 197 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
196 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 198 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
197 199
198 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 200 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
199 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 201 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
… …
286sub set_visible { 288sub set_visible {
287 my ($self) = @_; 289 my ($self) = @_;
288 290
289 return if $self->{visible}; 291 return if $self->{visible};
290 292
293 $self->{parent} && $self->{parent}{root}#d#
294 or return ::clienterror ("set_visible called without parent ($self->{parent}) or root\n" => 1);
295
291 $self->{root} = $self->{parent}{root}; 296 $self->{root} = $self->{parent}{root};
292 $self->{visible} = $self->{parent}{visible} + 1; 297 $self->{visible} = $self->{parent}{visible} + 1;
293 298
294 $self->emit (visibility_change => 1); 299 $self->emit (visibility_change => 1);
295 300
… …
527sub connect { 532sub connect {
528 my ($self, $signal, $cb) = @_; 533 my ($self, $signal, $cb) = @_;
529 534
530 push @{ $self->{signal_cb}{$signal} }, $cb; 535 push @{ $self->{signal_cb}{$signal} }, $cb;
531 536
532 defined wantarray and DC::guard { 537 defined wantarray and Guard::guard {
533 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 538 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
534 @{ $self->{signal_cb}{$signal} }; 539 @{ $self->{signal_cb}{$signal} };
535 } 540 }
536} 541}
537 542
… …
649 $class->SUPER::new ( 654 $class->SUPER::new (
650 #bg => [0, 0, 0, 0.2], 655 #bg => [0, 0, 0, 0.2],
651 #active_bg => [1, 1, 1, 0.5], 656 #active_bg => [1, 1, 1, 0.5],
652 @_ 657 @_
653 ) 658 )
659}
660
661sub set_bg {
662 my ($self, $bg) = @_;
663
664 $self->{bg} = $bg;
665 $self->update;
654} 666}
655 667
656sub _draw { 668sub _draw {
657 my ($self) = @_; 669 my ($self) = @_;
658 670
… …
1540 glEnable GL_TEXTURE_2D; 1552 glEnable GL_TEXTURE_2D;
1541 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1542 1554
1543 my $border = $self->border; 1555 my $border = $self->border;
1544 1556
1557 if ($border) {
1545 glColor @{ $self->{border_bg} }; 1558 glColor @{ $self->{border_bg} };
1546 $border[0]->draw_quad_alpha ( 0, 0, $w, $border); 1559 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1547 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch); 1560 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1548 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1561 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1549 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border); 1562 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1550 1563
1551 # move 1564 # move
1552 my $w2 = ($w - $border) * .5; 1565 my $w2 = ($w - $border) * .5;
1553 my $h2 = ($h - $border) * .5; 1566 my $h2 = ($h - $border) * .5;
1554 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border); 1567 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1555 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border); 1568 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1556 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border); 1569 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1557 1570
1558 # resize 1571 # resize
1559 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border); 1572 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1560 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border) 1573 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1561 unless $self->{has_close_button}; 1574 unless $self->{has_close_button};
1562 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border); 1575 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1563 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border); 1576 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1577 }
1564 1578
1565 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1579 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1566 glColor @{ $self->{bg} }; 1580 glColor @{ $self->{bg} };
1567 1581
1568 # TODO: repeat texture not scale 1582 # TODO: repeat texture not scale
… …
2516 2530
2517sub new { 2531sub new {
2518 my $class = shift; 2532 my $class = shift;
2519 2533
2520 $class->SUPER::new ( 2534 $class->SUPER::new (
2535 fontsize => 1,
2521 padding_x => 2, 2536 padding_x => 2,
2522 padding_y => 2, 2537 padding_y => 2,
2523 fg => [1, 1, 1], 2538 fg => [1, 1, 1],
2524 active_fg => [1, 1, 0], 2539 active_fg => [1, 1, 0],
2525 bg => [0, 0, 0, 0.2], 2540 bg => [0, 0, 0, 0.2],
… …
2531} 2546}
2532 2547
2533sub size_request { 2548sub size_request {
2534 my ($self) = @_; 2549 my ($self) = @_;
2535 2550
2536 (6) x 2 2551 ($self->{fontsize} * $::FONTSIZE) x 2
2537} 2552}
2538 2553
2539sub toggle { 2554sub toggle {
2540 my ($self) = @_; 2555 my ($self) = @_;
2541 2556
… …
2839 2854
2840sub new { 2855sub new {
2841 my ($class, %arg) = @_; 2856 my ($class, %arg) = @_;
2842 2857
2843 my $self = $class->SUPER::new ( 2858 my $self = $class->SUPER::new (
2859 padding_x => 2,
2860 padding_y => 2,
2844 fg => [1, 1, 1], 2861 fg => [1, 1, 1],
2845 bg => [0, 0, 1, 0.2], 2862 bg => [0, 0, 1, 0.2],
2846 bar => [0.7, 0.5, 0.1, 0.8], 2863 bar => [0.7, 0.5, 0.1, 0.8],
2847 outline => [0.4, 0.3, 0], 2864 outline => [0.4, 0.3, 0],
2848 fontsize => 0.9, 2865 fontsize => 0.9,
… …
2888 my ($self) = @_; 2905 my ($self) = @_;
2889 2906
2890 glEnable GL_BLEND; 2907 glEnable GL_BLEND;
2891 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2908 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2892 2909
2910 my $px = $self->{padding_x};
2911 my $py = $self->{padding_y};
2912
2893 if ($self->{value} >= 0) { 2913 if ($self->{value} >= 0) {
2894 my $s = int 2 + ($self->{w} - 4) * $self->{value}; 2914 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2895 2915
2896 glColor_premultiply @{$self->{bar}}; 2916 glColor_premultiply @{$self->{bar}};
2897 glRect 2, 2, $s, $self->{h} - 2; 2917 glRect $px, $py, $s, $self->{h} - $py;
2898 glColor_premultiply @{$self->{bg}}; 2918 glColor_premultiply @{$self->{bg}};
2899 glRect $s, 2, $self->{w} - 2, $self->{h} - 2; 2919 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2900 } 2920 }
2901 2921
2902 glColor_premultiply @{$self->{outline}}; 2922 glColor_premultiply @{$self->{outline}};
2923
2924 $px -= .5;
2925 $py -= .5;
2926
2903 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5; 2927 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2904 2928
2905 glDisable GL_BLEND; 2929 glDisable GL_BLEND;
2906 2930
2907 { 2931 {
2908 local $self->{bg}; # do not draw background 2932 local $self->{bg}; # do not draw background
… …
2917our @ISA = DC::UI::Progress::; 2941our @ISA = DC::UI::Progress::;
2918 2942
2919sub new { 2943sub new {
2920 my ($class, %arg) = @_; 2944 my ($class, %arg) = @_;
2921 2945
2946 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2947
2922 my $self = $class->SUPER::new ( 2948 my $self = $class->SUPER::new (
2949 %arg,
2923 tooltip => sub { 2950 tooltip => sub {
2924 my ($self) = @_; 2951 my ($self) = @_;
2925 2952
2926 sprintf "level %d\n%s points\n%s next level\n%s to go", 2953 sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done",
2954 $tt,
2927 $self->{lvl}, 2955 $self->{lvl},
2928 ::formsep ($self->{exp}), 2956 ::formsep ($self->{exp}),
2929 ::formsep ($self->{nxt}), 2957 ::formsep ($self->{nxt}),
2930 ::formsep ($self->{nxt} - $self->{exp}), 2958 ::formsep ($self->{nxt} - $self->{exp}),
2959 $self->_percent * 100,
2931 }, 2960 },
2932 %arg
2933 ); 2961 );
2934 2962
2935 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) } 2963 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2936 if $::CONN; 2964 if $::CONN;
2937 2965
… …
2945 if $::CONN; 2973 if $::CONN;
2946 2974
2947 $self->SUPER::DESTROY; 2975 $self->SUPER::DESTROY;
2948} 2976}
2949 2977
2978sub _percent {
2979 my ($self) = @_;
2980
2981 my $table = $::CONN && $::CONN->{exp_table}
2982 or return -1;
2983
2984 my $l0 = $table->[$self->{lvl} - 1];
2985 my $l1 = $table->[$self->{lvl}];
2986
2987 $self->{nxt} = $l1;
2988
2989 ($self->{exp} - $l0) / ($l1 - $l0)
2990}
2991
2950sub set_value { 2992sub set_value {
2951 my ($self, $lvl, $exp) = @_; 2993 my ($self, $lvl, $exp) = @_;
2952 2994
2953 $self->{lvl} = $lvl; 2995 $self->{lvl} = $lvl;
2954 $self->{exp} = $exp; 2996 $self->{exp} = $exp;
2955 2997
2956 my $v = -1;
2957
2958 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2959 my $l0 = $table->[$lvl - 1];
2960 my $l1 = $table->[$lvl];
2961
2962 $self->{nxt} = $l1;
2963
2964 $v = ($exp - $l0) / ($l1 - $l0);
2965 }
2966
2967 $self->SUPER::set_value ($v); 2998 $self->SUPER::set_value ($self->_percent);
2968} 2999}
2969 3000
2970############################################################################# 3001#############################################################################
2971 3002
2972package DC::UI::Gauge; 3003package DC::UI::Gauge;
… …
3702 aspect => 1, 3733 aspect => 1,
3703 can_events => 0, 3734 can_events => 0,
3704 @_, 3735 @_,
3705 ); 3736 );
3706 3737
3707 if ($self->{anim} && $self->{animspeed}) {
3708 DC::weaken (my $widget = $self);
3709
3710 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3711 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3712 return unless $::CONN;
3713
3714 my $w = $widget
3715 or return;
3716
3717 ++$w->{frame};
3718 $w->update_face;
3719
3720 # somehow, $widget can go away
3721 $w->update;
3722 $w->update_timer;
3723 };
3724
3725 $self->update_face;
3726 $self->update_timer; 3738 $self->update_anim;
3727 }
3728 3739
3729 $self 3740 $self
3730} 3741}
3731 3742
3732sub update_timer { 3743sub update_timer {
… …
3755 $tex->upload (sub { $self->reconfigure }); 3766 $tex->upload (sub { $self->reconfigure });
3756 } 3767 }
3757 } 3768 }
3758 } 3769 }
3759 } 3770 }
3771 }
3772}
3773
3774sub update_anim {
3775 my ($self) = @_;
3776
3777 if ($self->{anim} && $self->{animspeed}) {
3778 DC::weaken (my $widget = $self);
3779
3780 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3781 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3782 return unless $::CONN;
3783
3784 my $w = $widget
3785 or return;
3786
3787 ++$w->{frame};
3788 $w->update_face;
3789
3790 # somehow, $widget can go away
3791 $w->update;
3792 $w->update_timer;
3793 };
3794
3795 $self->update_face;
3796 $self->update_timer;
3797 } else {
3798 delete $self->{timer};
3760 } 3799 }
3761} 3800}
3762 3801
3763sub size_request { 3802sub size_request {
3764 my ($self) = @_; 3803 my ($self) = @_;
… …
3786 return unless $self->{visible}; 3825 return unless $self->{visible};
3787 3826
3788 $self->SUPER::update; 3827 $self->SUPER::update;
3789} 3828}
3790 3829
3830sub set_face {
3831 my ($self, $face) = @_;
3832
3833 $self->{face} = $face;
3834 $self->reconfigure;
3835}
3836
3837sub set_anim {
3838 my ($self, $anim) = @_;
3839
3840 $self->{anim} = $anim;
3841 $self->update_anim;
3842}
3843
3844sub set_animspeed {
3845 my ($self, $animspeed) = @_;
3846
3847 $self->{animspeed} = $animspeed;
3848 $self->update_anim;
3849}
3850
3791sub invoke_visibility_change { 3851sub invoke_visibility_change {
3792 my ($self) = @_; 3852 my ($self) = @_;
3793 3853
3794 $self->update_timer; 3854 $self->update_timer;
3795 3855
… …
3891 # maybe save $GRAB? must be careful about events... 3951 # maybe save $GRAB? must be careful about events...
3892 $GRAB = $self; 3952 $GRAB = $self;
3893 $self->{button} = $ev->{button}; 3953 $self->{button} = $ev->{button};
3894 3954
3895 $self->show; 3955 $self->show;
3896 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3956
3957 my $x = $ev->{x};
3958 my $y = $ev->{y};
3959
3960 $self->{root}->on_post_alloc ($self => sub {
3961 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
3962 });
3963
3964 1 # so it can be used inside event handlers
3897} 3965}
3898 3966
3899sub invoke_mouse_motion { 3967sub invoke_mouse_motion {
3900 my ($self, $ev, $x, $y) = @_; 3968 my ($self, $ev, $x, $y) = @_;
3901 3969
… …
3944 my ($self, @widgets) = @_; 4012 my ($self, @widgets) = @_;
3945 4013
3946 $self->SUPER::add (@widgets); 4014 $self->SUPER::add (@widgets);
3947 4015
3948 $self->set_current_page (0) 4016 $self->set_current_page (0)
3949 unless @widgets == @{ $self->{children} }; 4017 if @widgets == @{ $self->{children} };
3950} 4018}
3951 4019
3952sub get_current_page { 4020sub get_current_page {
3953 my ($self) = @_; 4021 my ($self) = @_;
3954 4022
… …
4595 4663
4596$ROOT = new DC::UI::Root; 4664$ROOT = new DC::UI::Root;
4597$TOOLTIP = new DC::UI::Tooltip z => 900; 4665$TOOLTIP = new DC::UI::Tooltip z => 900;
4598 4666
45991 46671
4600

Diff Legend

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