… | |
… | |
39 | my ($self, $command, $tooltip, $widget, $cb) = @_; |
39 | my ($self, $command, $tooltip, $widget, $cb) = @_; |
40 | |
40 | |
41 | (my $data = $command) =~ s/\\//g; |
41 | (my $data = $command) =~ s/\\//g; |
42 | |
42 | |
43 | $tooltip =~ s/^\s+//; |
43 | $tooltip =~ s/^\s+//; |
44 | |
|
|
45 | $tooltip = "<big>$data</big>\n\n$tooltip"; |
44 | $tooltip = "<big>$data</big>\n\n$tooltip"; |
46 | |
|
|
47 | $tooltip =~ s/\s+$//; |
45 | $tooltip =~ s/\s+$//; |
48 | |
46 | |
49 | $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; |
47 | $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; |
50 | } |
48 | } |
51 | |
49 | |
… | |
… | |
136 | $::CONN->user_send ("apply"); |
134 | $::CONN->user_send ("apply"); |
137 | } elsif ($uni == ord ".") { |
135 | } elsif ($uni == ord ".") { |
138 | $::CONN->user_send ($self->{completer}{last_command}) |
136 | $::CONN->user_send ($self->{completer}{last_command}) |
139 | if exists $self->{completer}{last_command}; |
137 | if exists $self->{completer}{last_command}; |
140 | } elsif ($uni == ord "\t") { |
138 | } elsif ($uni == ord "\t") { |
141 | # TODO: toggle inventory |
139 | $::INV_WINDOW->toggle_visibility; |
142 | } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { |
140 | } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { |
143 | $::CONN->user_send ("rotateshoottype +"); |
141 | $::CONN->user_send ("rotateshoottype +"); |
144 | } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { |
142 | } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { |
145 | $::CONN->user_send ("rotateshoottype -"); |
143 | $::CONN->user_send ("rotateshoottype -"); |
146 | } elsif ($uni == ord '"') { |
144 | } elsif ($uni == ord '"') { |
… | |
… | |
204 | glTranslate $sx0 - 32, $sy0 - 32, 0; |
202 | glTranslate $sx0 - 32, $sy0 - 32, 0; |
205 | |
203 | |
206 | my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); |
204 | my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); |
207 | |
205 | |
208 | if ($::CFG->{fow_enable}) { |
206 | if ($::CFG->{fow_enable}) { |
209 | if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war |
207 | if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
210 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
208 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
211 | glConvolutionFilter2D ( |
209 | glConvolutionFilter2D ( |
212 | GL_CONVOLUTION_2D, |
210 | GL_CONVOLUTION_2D, |
213 | GL_ALPHA, |
211 | GL_ALPHA, |
214 | 3, 3, |
212 | 3, 3, |
… | |
… | |
267 | glVertex $::WIDTH, $::HEIGHT; |
265 | glVertex $::WIDTH, $::HEIGHT; |
268 | glVertex $::WIDTH, 0; |
266 | glVertex $::WIDTH, 0; |
269 | glEnd; |
267 | glEnd; |
270 | glDisable GL_BLEND; |
268 | glDisable GL_BLEND; |
271 | |
269 | |
272 | $self->{out_of_focus} ||= do { |
270 | # $self->{out_of_focus} ||= do { |
273 | my $label = new CFClient::UI::Label |
271 | # my $label = new CFClient::UI::Label |
274 | x => 0, |
272 | # x => 0, |
275 | y => 0, |
273 | # y => 0, |
276 | z => 1, |
274 | # z => 1, |
277 | ellipsise => 0, |
275 | # ellipsise => 0, |
278 | text => "map out of focus (click map to play)"; |
276 | # text => "map out of focus (click map to play)"; |
279 | |
277 | # |
280 | $label->show; |
278 | # $label->show; |
281 | $label->update; |
279 | # $label->update; |
282 | |
280 | # |
283 | $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub { |
281 | # $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub { |
284 | $label->move ( |
282 | # $label->move ( |
285 | ($::WIDTH - $label->{w}) * 0.5, |
283 | # ($::WIDTH - $label->{w}) * 0.5, |
286 | ($::HEIGHT - $label->{h}) * 0.5, |
284 | # ($::HEIGHT - $label->{h}) * 0.5, |
287 | ); |
285 | # ); |
288 | }); |
286 | # }); |
289 | |
287 | # |
290 | $label |
288 | # $label |
291 | }; |
289 | # }; |
292 | } |
290 | } |
293 | } |
291 | } |
294 | |
292 | |
295 | sub DESTROY { |
293 | sub DESTROY { |
296 | my $self = shift; |
294 | my $self = shift; |
… | |
… | |
406 | fontsize => $_, |
404 | fontsize => $_, |
407 | ), (0.8) x 16 |
405 | ), (0.8) x 16 |
408 | ]; |
406 | ]; |
409 | |
407 | |
410 | $self->{entry} = new CFClient::UI::Entry |
408 | $self->{entry} = new CFClient::UI::Entry |
411 | connect_changed => sub { |
409 | on_changed => sub { |
412 | $self->update_labels; |
410 | $self->update_labels; |
413 | }, |
411 | }, |
414 | connect_key_down => sub { |
412 | on_key_down => sub { |
415 | my ($entry, $ev) = @_; |
413 | my ($entry, $ev) = @_; |
416 | |
414 | |
417 | my $self = $entry->{parent}{parent}; |
415 | my $self = $entry->{parent}{parent}; |
418 | |
416 | |
419 | if ($ev->{sym} == 13) { |
417 | if ($ev->{sym} == 13) { |
… | |
… | |
521 | |
519 | |
522 | @match = map $self->{command}{$_->[0]}, |
520 | @match = map $self->{command}{$_->[0]}, |
523 | sort { |
521 | sort { |
524 | $a->[1] <=> $b->[1] |
522 | $a->[1] <=> $b->[1] |
525 | or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] |
523 | or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] |
526 | or (length $a->[0]) <=> (length $b->[0]) |
524 | or (length $b->[0]) <=> (length $a->[0]) |
527 | } @match; |
525 | } @match; |
528 | } |
526 | } |
529 | |
527 | |
530 | $self->{last_search} = $cmd; |
528 | $self->{last_search} = $text; |
531 | $self->{last_match} = \@match; |
529 | $self->{last_match} = \@match; |
532 | |
530 | |
533 | $self->{select_offset} = 0; |
531 | $self->{select_offset} = 0; |
534 | } |
532 | } |
535 | |
533 | |