| … | |
… | |
| 20 | ); |
20 | ); |
| 21 | |
21 | |
| 22 | $self->{completer} = new CFClient::MapWidget::Command:: |
22 | $self->{completer} = new CFClient::MapWidget::Command:: |
| 23 | command => $self->{command}, |
23 | command => $self->{command}, |
| 24 | can_focus => 1, |
24 | can_focus => 1, |
|
|
25 | tooltip => "<b>The Command Completer</b>\n\n" |
|
|
26 | . "This is your central interface to send text commands to the server. " |
|
|
27 | . "To enter a verbatim command to send to the server, just type the command, " |
|
|
28 | . "followed by a space, and press return. " |
|
|
29 | . "Typing the initial letters of words (or just any letters) displays guesses " |
|
|
30 | . "for commands you might want to use.\n" |
|
|
31 | . "You can use the cursor-up and cursor-down keys to select between those guesses.\n" |
|
|
32 | . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.", |
| 25 | ; |
33 | ; |
| 26 | |
34 | |
| 27 | $self |
35 | $self |
| 28 | } |
36 | } |
| 29 | |
37 | |
| … | |
… | |
| 31 | my ($self, $command, $tooltip, $widget, $cb) = @_; |
39 | my ($self, $command, $tooltip, $widget, $cb) = @_; |
| 32 | |
40 | |
| 33 | (my $data = $command) =~ s/\\//g; |
41 | (my $data = $command) =~ s/\\//g; |
| 34 | |
42 | |
| 35 | $tooltip =~ s/^\s+//; |
43 | $tooltip =~ s/^\s+//; |
| 36 | |
|
|
| 37 | $tooltip = "<big>$data</big>\n\n$tooltip"; |
44 | $tooltip = "<big>$data</big>\n\n$tooltip"; |
| 38 | |
|
|
| 39 | $tooltip =~ s/\s+$//; |
45 | $tooltip =~ s/\s+$//; |
| 40 | |
46 | |
| 41 | $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; |
47 | $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; |
| 42 | } |
48 | } |
| 43 | |
49 | |
| … | |
… | |
| 124 | $::CONN->user_send ("stay fire"); |
130 | $::CONN->user_send ("stay fire"); |
| 125 | } elsif ($uni == ord ",") { |
131 | } elsif ($uni == ord ",") { |
| 126 | $::CONN->user_send ("take"); |
132 | $::CONN->user_send ("take"); |
| 127 | } elsif ($uni == ord " ") { |
133 | } elsif ($uni == ord " ") { |
| 128 | $::CONN->user_send ("apply"); |
134 | $::CONN->user_send ("apply"); |
|
|
135 | } elsif ($uni == ord ".") { |
|
|
136 | $::CONN->user_send ($self->{completer}{last_command}) |
|
|
137 | if exists $self->{completer}{last_command}; |
| 129 | } elsif ($uni == ord "\t") { |
138 | } elsif ($uni == ord "\t") { |
| 130 | # TODO: toggle inventory |
139 | $::INV_WINDOW->toggle_visibility; |
| 131 | } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { |
140 | } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { |
| 132 | $::CONN->user_send ("rotateshoottype +"); |
141 | $::CONN->user_send ("rotateshoottype +"); |
| 133 | } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { |
142 | } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { |
| 134 | $::CONN->user_send ("rotateshoottype -"); |
143 | $::CONN->user_send ("rotateshoottype -"); |
| 135 | } elsif ($uni == ord '"') { |
144 | } elsif ($uni == ord '"') { |
| … | |
… | |
| 193 | glTranslate $sx0 - 32, $sy0 - 32, 0; |
202 | glTranslate $sx0 - 32, $sy0 - 32, 0; |
| 194 | |
203 | |
| 195 | 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); |
| 196 | |
205 | |
| 197 | if ($::CFG->{fow_enable}) { |
206 | if ($::CFG->{fow_enable}) { |
| 198 | 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 |
| 199 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
208 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
| 200 | glConvolutionFilter2D ( |
209 | glConvolutionFilter2D ( |
| 201 | GL_CONVOLUTION_2D, |
210 | GL_CONVOLUTION_2D, |
| 202 | GL_ALPHA, |
211 | GL_ALPHA, |
| 203 | 3, 3, |
212 | 3, 3, |
| … | |
… | |
| 256 | glVertex $::WIDTH, $::HEIGHT; |
265 | glVertex $::WIDTH, $::HEIGHT; |
| 257 | glVertex $::WIDTH, 0; |
266 | glVertex $::WIDTH, 0; |
| 258 | glEnd; |
267 | glEnd; |
| 259 | glDisable GL_BLEND; |
268 | glDisable GL_BLEND; |
| 260 | |
269 | |
| 261 | $self->{out_of_focus} ||= do { |
270 | # $self->{out_of_focus} ||= do { |
| 262 | my $label = new CFClient::UI::Label |
271 | # my $label = new CFClient::UI::Label |
| 263 | x => 0, |
272 | # x => 0, |
| 264 | y => 0, |
273 | # y => 0, |
| 265 | z => 1, |
274 | # z => 1, |
| 266 | ellipsise => 0, |
275 | # ellipsise => 0, |
| 267 | text => "map out of focus (click map to play)"; |
276 | # text => "map out of focus (click map to play)"; |
| 268 | |
277 | # |
| 269 | $label->show; |
278 | # $label->show; |
| 270 | $label->update; |
279 | # $label->update; |
| 271 | |
280 | # |
| 272 | $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub { |
281 | # $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub { |
| 273 | $label->move ( |
282 | # $label->move ( |
| 274 | ($::WIDTH - $label->{w}) * 0.5, |
283 | # ($::WIDTH - $label->{w}) * 0.5, |
| 275 | ($::HEIGHT - $label->{h}) * 0.5, |
284 | # ($::HEIGHT - $label->{h}) * 0.5, |
| 276 | ); |
285 | # ); |
| 277 | }); |
286 | # }); |
| 278 | |
287 | # |
| 279 | $label |
288 | # $label |
| 280 | }; |
289 | # }; |
| 281 | } |
290 | } |
| 282 | } |
291 | } |
| 283 | |
292 | |
| 284 | sub DESTROY { |
293 | sub DESTROY { |
| 285 | my $self = shift; |
294 | my $self = shift; |
| … | |
… | |
| 395 | fontsize => $_, |
404 | fontsize => $_, |
| 396 | ), (0.8) x 16 |
405 | ), (0.8) x 16 |
| 397 | ]; |
406 | ]; |
| 398 | |
407 | |
| 399 | $self->{entry} = new CFClient::UI::Entry |
408 | $self->{entry} = new CFClient::UI::Entry |
| 400 | connect_changed => sub { |
409 | on_changed => sub { |
| 401 | $self->update_labels; |
410 | $self->update_labels; |
| 402 | }, |
411 | }, |
| 403 | connect_key_down => sub { |
412 | on_key_down => sub { |
| 404 | my ($entry, $ev) = @_; |
413 | my ($entry, $ev) = @_; |
| 405 | |
414 | |
| 406 | my $self = $entry->{parent}{parent}; |
415 | my $self = $entry->{parent}{parent}; |
| 407 | |
416 | |
| 408 | if ($ev->{sym} == 13) { |
417 | if ($ev->{sym} == 13) { |
| 409 | if (exists $self->{select}) { |
418 | if (exists $self->{select}) { |
|
|
419 | $self->{last_command} = $self->{select}; |
| 410 | $::CONN->user_send ($self->{select}); |
420 | $::CONN->user_send ($self->{select}); |
| 411 | $self->hide; |
421 | $self->hide; |
| 412 | } |
422 | } |
| 413 | } elsif ($ev->{sym} == 27) { |
423 | } elsif ($ev->{sym} == 27) { |
| 414 | $self->hide; |
424 | $self->hide; |
| … | |
… | |
| 509 | |
519 | |
| 510 | @match = map $self->{command}{$_->[0]}, |
520 | @match = map $self->{command}{$_->[0]}, |
| 511 | sort { |
521 | sort { |
| 512 | $a->[1] <=> $b->[1] |
522 | $a->[1] <=> $b->[1] |
| 513 | or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] |
523 | or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] |
| 514 | or (length $a->[0]) <=> (length $b->[0]) |
524 | or (length $b->[0]) <=> (length $a->[0]) |
| 515 | } @match; |
525 | } @match; |
| 516 | } |
526 | } |
| 517 | |
527 | |
| 518 | $self->{last_search} = $cmd; |
528 | $self->{last_search} = $text; |
| 519 | $self->{last_match} = \@match; |
529 | $self->{last_match} = \@match; |
| 520 | |
530 | |
| 521 | $self->{select_offset} = 0; |
531 | $self->{select_offset} = 0; |
| 522 | } |
532 | } |
| 523 | |
533 | |
