--- deliantra/Deliantra-Client/DC/MapWidget.pm 2006/06/03 23:47:47 1.50 +++ deliantra/Deliantra-Client/DC/MapWidget.pm 2006/06/08 18:18:16 1.52 @@ -16,6 +16,13 @@ z => -1, can_focus => 1, list => glGenList, + + smooth_matrix => [ + 0.05, 0.13, 0.05, + 0.13, 0.30, 0.13, + 0.05, 0.13, 0.05, + ], + @_ ); @@ -254,10 +261,7 @@ GL_ALPHA, 3, 3, GL_ALPHA, GL_FLOAT, - pack "f*", - 0.05, 0.13, 0.05, - 0.13, 0.30, 0.13, - 0.05, 0.13, 0.05, + (pack "f*", @{ $self->{smooth_matrix} }), ); glEnable GL_CONVOLUTION_2D; } @@ -461,18 +465,41 @@ if (exists $self->{select}) { $self->{last_command} = $self->{select}; $::CONN->user_send ($self->{select}); + + unshift @{$self->{history}}, $self->{select}; + $self->{hist_ptr} = 0; + $self->hide; } } elsif ($ev->{sym} == 27) { + $self->{hist_ptr} = 0; $self->hide; return; } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { - ++$self->{select_offset} - if $self->{select_offset} < $#{ $self->{last_match} || [] }; + if ($self->{hist_ptr} > 1) { + $self->{hist_ptr}--; + $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); + } elsif ($self->{hist_ptr} > 0) { + $self->{hist_ptr}--; + $self->{entry}->set_text ($self->{hist_saveback}); + } else { + ++$self->{select_offset} + if $self->{select_offset} < $#{ $self->{last_match} || [] }; + } $self->update_labels; } elsif ($ev->{sym} == CFClient::SDLK_UP) { - --$self->{select_offset} - if $self->{select_offset}; + if ($self->{select_offset}) { + --$self->{select_offset} + } else { + unless ($self->{hist_ptr}) { + $self->{hist_saveback} = $self->{entry}->get_text; + } + if ($self->{hist_ptr} <= $#{$self->{history}}) { + $self->{hist_ptr}++; + } + $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]) + if exists $self->{history}->[$self->{hist_ptr} - 1]; + } $self->update_labels; } else { return 0;