--- deliantra/Deliantra-Client/DC/MapWidget.pm 2006/06/08 18:18:16 1.52 +++ deliantra/Deliantra-Client/DC/MapWidget.pm 2006/06/15 08:29:18 1.60 @@ -63,16 +63,19 @@ sub button_down { my ($self, $ev, $x, $y) = @_; + return unless $::CONN; + $self->focus_in; if ($ev->{button} == 1) { - my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; - my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; + my $x = CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; + my $y = CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; - my $fx = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}) - 0.5 * $sw + 0.99; - my $fy = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}) - 0.5 * $sh + 0.99; + $x -= int 0.5 * $self->{sw}; + $y -= int 0.5 * $self->{sh}; - $::CONN->send (sprintf "lookat %d %d", $fx, $fy); + $::CONN->lookat ($x, $y) + if $::CONN; } elsif ($ev->{button} == 2) { my ($ox, $oy) = ($ev->{x}, $ev->{y}); @@ -176,7 +179,10 @@ } elsif (exists $DIR{$sym}) { if ($mod & CFClient::KMOD_SHIFT) { $self->{shft}++; - $::CONN->user_send ("fire $DIR{$sym}[0]"); + if ($DIR{$sym}[0] != $self->{fire_dir}) { + $::CONN->user_send ("fire $DIR{$sym}[0]"); + } + $self->{fire_dir} = $DIR{$sym}[0]; } elsif ($mod & CFClient::KMOD_CTRL) { $self->{ctrl}++; $::CONN->user_send ("run $DIR{$sym}[0]"); @@ -214,9 +220,22 @@ my $mod = $ev->{mod}; my $sym = $ev->{sym}; - if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { - $::CONN->user_send ("fire_stop"); - $res = 1; + if ($::CFG->{shift_fire_stop}) { + if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { + $::CONN->user_send ("fire_stop"); + delete $self->{fire_dir}; + $res = 1; + } + } else { + if (exists $DIR{$sym} && delete $self->{shft}) { + $::CONN->user_send ("fire_stop"); + delete $self->{fire_dir}; + $res = 1; + } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? + $::CONN->user_send ("fire_stop"); + delete $self->{fire_dir}; + $res = 1; + } } if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { @@ -230,6 +249,8 @@ sub draw { my ($self) = @_; + return unless $::MAP; + my $focused = $CFClient::UI::FOCUS == $self || $CFClient::UI::FOCUS == $self->{completer}{entry}; @@ -237,60 +258,65 @@ unless $focused || !$::FAST; if (delete $self->{need_update}) { + my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; + + my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; + my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; + + my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; + my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; + + my $sw = $self->{sw} = 1 + CFClient::ceil $::WIDTH / $tilesize; + my $sh = $self->{sh} = 1 + CFClient::ceil $::HEIGHT / $tilesize; + + if ($::CFG->{fow_enable}) { + my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); + + if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war + glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); + glConvolutionFilter2D ( + GL_CONVOLUTION_2D, + GL_ALPHA, + 3, 3, + GL_ALPHA, GL_FLOAT, + (pack "f*", @{ $self->{smooth_matrix} }), + ); + glEnable GL_CONVOLUTION_2D; + } + + $self->{fow_texture} = new CFClient::Texture + w => $w, + h => $h, + data => $data, + internalformat => GL_ALPHA, + format => GL_ALPHA; + + glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; + } else { + delete $self->{fow_texture}; + } + glNewList $self->{list}; - if ($::MAP) { - my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; - my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; - - my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32; - my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32; - - glPushMatrix; - glScale $::CFG->{map_scale}, $::CFG->{map_scale}; - - glTranslate $sx0 - 32, $sy0 - 32, 0; - - my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); - - if ($::CFG->{fow_enable}) { - if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war - glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); - glConvolutionFilter2D ( - GL_CONVOLUTION_2D, - GL_ALPHA, - 3, 3, - GL_ALPHA, GL_FLOAT, - (pack "f*", @{ $self->{smooth_matrix} }), - ); - glEnable GL_CONVOLUTION_2D; - } - - $self->{fow_texture_name} ||= glGenTexture; - # try to re-use the texture name: TODO improve texture class instead - - $self->{fow_texture} = new CFClient::Texture - w => $w, - h => $h, - data => $data, - name => $self->{fow_texture_name}, - internalformat => GL_ALPHA, - format => GL_ALPHA; - - glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; + glPushMatrix; + glTranslate $sx0, $sy0; + glScale $::CFG->{map_scale}, $::CFG->{map_scale}; - glEnable GL_TEXTURE_2D; - glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; + $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); - glColor +($::CFG->{fow_intensity}) x 3, 0.8; - $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); + if (my $tex = $self->{fow_texture}) { + glEnable GL_TEXTURE_2D; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; - glDisable GL_TEXTURE_2D; - } + glScale 32, 32; + glColor +($::CFG->{fow_intensity}) x 3, 0.9; + $self->{fow_texture}->draw_quad_alpha (0, 0); - glPopMatrix; + glDisable GL_TEXTURE_2D; } + glPopMatrix; + glEndList; } @@ -299,10 +325,7 @@ glPopMatrix; # TNT2 emulates logops in software (or worse :) - if ($focused) { - (delete $self->{out_of_focus})->destroy - if $self->{out_of_focus}; - } else { + unless ($focused) { glColor 0.4, 0.2, 0.2, 0.6; glEnable GL_BLEND; glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; @@ -313,27 +336,6 @@ glVertex $::WIDTH, 0; glEnd; glDisable GL_BLEND; - -# $self->{out_of_focus} ||= do { -# my $label = new CFClient::UI::Label -# x => 0, -# y => 0, -# z => 1, -# ellipsise => 0, -# text => "map out of focus (click map to play)"; -# -# $label->show; -# $label->update; -# -# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub { -# $label->move_abs ( -# ($::WIDTH - $label->{w}) * 0.5, -# ($::HEIGHT - $label->{h}) * 0.5, -# ); -# }); -# -# $label -# }; } } @@ -456,6 +458,19 @@ on_changed => sub { $self->update_labels; }, + on_button_down => sub { + my ($entry, $ev, $x, $y) = @_; + + if ($ev->{button} == 3) { + (new CFClient::UI::Menu + items => [ + ["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->focus_in }) }] + ], + )->popup ($ev); + return 1; + } + 0 + }, on_key_down => sub { my ($entry, $ev) = @_;