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.348 by root, Thu Aug 17 01:27:28 2006 UTC vs.
Revision 1.357 by root, Fri Dec 8 13:49:57 2006 UTC

… …
514); 514);
515 515
516sub emit { 516sub emit {
517 my ($self, $signal, @args) = @_; 517 my ($self, $signal, @args) = @_;
518 518
519 # I do not really like this solution, but I dislike duplication 519 # I do not really like this solution, but I do not like duplication
520 # and needlessly verbose code, too. 520 # and needlessly verbose code, either.
521 my @append 521 my @append
522 = $has_coords{$signal} 522 = $has_coords{$signal}
523 ? $args[0]->xy ($self) 523 ? $args[0]->xy ($self)
524 : (); 524 : ();
525 525
… …
898 glClear GL_COLOR_BUFFER_BIT; 898 glClear GL_COLOR_BUFFER_BIT;
899 899
900 { 900 {
901 package CFPlus::UI::Base; 901 package CFPlus::UI::Base;
902 902
903 ($draw_x, $draw_y, $draw_w, $draw_h) = 903 local ($draw_x, $draw_y, $draw_w, $draw_h) =
904 (0, 0, $self->{w}, $self->{h}); 904 (0, 0, $self->{w}, $self->{h});
905
906 $self->_render;
905 } 907 }
906
907 $self->_render;
908 }; 908 };
909} 909}
910 910
911sub _draw { 911sub _draw {
912 my ($self) = @_; 912 my ($self) = @_;
… …
1968 $self->{cursor} = 0; 1968 $self->{cursor} = 0;
1969 } elsif ($sym == CFPlus::SDLK_END) { 1969 } elsif ($sym == CFPlus::SDLK_END) {
1970 $self->{cursor} = length $text; 1970 $self->{cursor} = length $text;
1971 } elsif ($uni == 21) { # ctrl-u 1971 } elsif ($uni == 21) { # ctrl-u
1972 $text = ""; 1972 $text = "";
1973 $self->{cursor} = 0;
1973 } elsif ($uni == 27) { 1974 } elsif ($uni == 27) {
1974 $self->emit ('escape'); 1975 $self->emit ('escape');
1975 } elsif ($uni) { 1976 } elsif ($uni >= 0x20) {
1976 substr $text, $self->{cursor}++, 0, chr $uni; 1977 substr $text, $self->{cursor}++, 0, chr $uni;
1977 } else { 1978 } else {
1978 return 0; 1979 return 0;
1979 } 1980 }
1980 1981
… …
2958 2959
2959 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 2960 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2960 glClearColor 0, 0, 0, 0; 2961 glClearColor 0, 0, 0, 0;
2961 glClear GL_COLOR_BUFFER_BIT; 2962 glClear GL_COLOR_BUFFER_BIT;
2962 2963
2964 package CFPlus::UI::Base;
2965 local ($draw_x, $draw_y, $draw_w, $draw_h) =
2966 (0, 0, $self->{w}, $self->{h});
2967
2963 my $top = int $self->{children}[1]{range}[0]; 2968 my $top = int $self->{children}[1]{range}[0];
2964 2969
2965 my $paridx = 0; 2970 my $paridx = 0;
2966 my $top_paragraph; 2971 my $top_paragraph;
2967 my $top = int $self->{children}[1]{range}[0]; 2972 my $top = int $self->{children}[1]{range}[0];
… …
3283 3288
3284package CFPlus::UI::Buttonbar; 3289package CFPlus::UI::Buttonbar;
3285 3290
3286our @ISA = CFPlus::UI::HBox::; 3291our @ISA = CFPlus::UI::HBox::;
3287 3292
3288# TODO: should actualyl wrap buttons and other goodies. 3293# TODO: should actually wrap buttons and other goodies.
3289 3294
3290############################################################################# 3295#############################################################################
3291 3296
3292package CFPlus::UI::Menu; 3297package CFPlus::UI::Menu;
3293 3298
… …
3822 if ($ev->{button} == 1) { 3827 if ($ev->{button} == 1) {
3823 $::CONN->user_send ("cast $spell->{name}"); 3828 $::CONN->user_send ("cast $spell->{name}");
3824 } elsif ($ev->{button} == 2) { 3829 } elsif ($ev->{button} == 2) {
3825 $::CONN->user_send ("invoke $spell->{name}"); 3830 $::CONN->user_send ("invoke $spell->{name}");
3826 } elsif ($ev->{button} == 3) { 3831 } elsif ($ev->{button} == 3) {
3832 my $shortname = CFPlus::shorten $spell->{name}, 14;
3827 (new CFPlus::UI::Menu 3833 (new CFPlus::UI::Menu
3828 items => [ 3834 items => [
3829 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3835 ["bind <i>cast $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3830 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3836 ["bind <i>invoke $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3831 ], 3837 ],
3832 )->popup ($ev); 3838 )->popup ($ev);
3833 } else { 3839 } else {
3834 return 0; 3840 return 0;
3835 } 3841 }
3836 3842
3837 1 3843 1
3838 }; 3844 };
3839 3845
3840 my $tooltip = "$spell->{message}$TOOLTIP_ALL"; 3846 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3841 3847
3842 #TODO: add path info to tooltip 3848 #TODO: add path info to tooltip
3843 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path}); 3849 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3844 3850
3845 $self->add (0, $row, new CFPlus::UI::Face 3851 $self->add (0, $row, new CFPlus::UI::Face
… …
4123 glLoadIdentity; 4129 glLoadIdentity;
4124 4130
4125 { 4131 {
4126 package CFPlus::UI::Base; 4132 package CFPlus::UI::Base;
4127 4133
4128 ($draw_x, $draw_y, $draw_w, $draw_h) = 4134 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4129 (0, 0, $self->{w}, $self->{h}); 4135 (0, 0, $self->{w}, $self->{h});
4130 }
4131 4136
4132 $self->_draw; 4137 $self->_draw;
4138 }
4133} 4139}
4134 4140
4135############################################################################# 4141#############################################################################
4136 4142
4137package CFPlus::UI; 4143package CFPlus::UI;

Diff Legend

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