… | |
… | |
14 | |
14 | |
15 | my $self = $class->SUPER::new ( |
15 | my $self = $class->SUPER::new ( |
16 | z => -1, |
16 | z => -1, |
17 | can_focus => 1, |
17 | can_focus => 1, |
18 | list => glGenList, |
18 | list => glGenList, |
|
|
19 | |
|
|
20 | smooth_matrix => [ |
|
|
21 | 0.05, 0.13, 0.05, |
|
|
22 | 0.13, 0.30, 0.13, |
|
|
23 | 0.05, 0.13, 0.05, |
|
|
24 | ], |
|
|
25 | |
19 | @_ |
26 | @_ |
20 | ); |
27 | ); |
21 | |
28 | |
22 | $self->{completer} = new CFClient::MapWidget::Command:: |
29 | $self->{completer} = new CFClient::MapWidget::Command:: |
23 | command => $self->{command}, |
30 | command => $self->{command}, |
… | |
… | |
54 | } |
61 | } |
55 | |
62 | |
56 | sub button_down { |
63 | sub button_down { |
57 | my ($self, $ev, $x, $y) = @_; |
64 | my ($self, $ev, $x, $y) = @_; |
58 | |
65 | |
|
|
66 | return unless $::CONN; |
|
|
67 | |
59 | $self->focus_in; |
68 | $self->focus_in; |
60 | |
69 | |
61 | if ($ev->{button} == 2) { |
70 | if ($ev->{button} == 1) { |
|
|
71 | my $x = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}); |
|
|
72 | my $y = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}); |
|
|
73 | |
|
|
74 | $x += int 0.5 * ($::MAP->w - $self->{sw} - 1); |
|
|
75 | $y += int 0.5 * ($::MAP->h - $self->{sh} - 1); |
|
|
76 | |
|
|
77 | $x -= int 0.5 * $::MAP->w; |
|
|
78 | $y -= int 0.5 * $::MAP->h; |
|
|
79 | |
|
|
80 | $x += 1; |
|
|
81 | $y += 1; |
|
|
82 | |
|
|
83 | $::CONN->lookat ($x, $y) |
|
|
84 | if $::CONN; |
|
|
85 | |
|
|
86 | } elsif ($ev->{button} == 2) { |
62 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
87 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
63 | my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); |
88 | my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); |
64 | |
89 | |
65 | $self->{motion} = sub { |
90 | $self->{motion} = sub { |
66 | my ($ev, $x, $y) = @_; |
91 | my ($ev, $x, $y) = @_; |
… | |
… | |
158 | $self->{completer}->set_prefix (""); |
183 | $self->{completer}->set_prefix (""); |
159 | $self->{completer}->show; |
184 | $self->{completer}->show; |
160 | } elsif (exists $DIR{$sym}) { |
185 | } elsif (exists $DIR{$sym}) { |
161 | if ($mod & CFClient::KMOD_SHIFT) { |
186 | if ($mod & CFClient::KMOD_SHIFT) { |
162 | $self->{shft}++; |
187 | $self->{shft}++; |
|
|
188 | if ($DIR{$sym}[0] != $self->{fire_dir}) { |
163 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
189 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
|
|
190 | } |
|
|
191 | $self->{fire_dir} = $DIR{$sym}[0]; |
164 | } elsif ($mod & CFClient::KMOD_CTRL) { |
192 | } elsif ($mod & CFClient::KMOD_CTRL) { |
165 | $self->{ctrl}++; |
193 | $self->{ctrl}++; |
166 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
194 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
167 | } else { |
195 | } else { |
168 | $::CONN->user_send ("$DIR{$sym}[1]"); |
196 | $::CONN->user_send ("$DIR{$sym}[1]"); |
… | |
… | |
196 | |
224 | |
197 | my $res = 0; |
225 | my $res = 0; |
198 | my $mod = $ev->{mod}; |
226 | my $mod = $ev->{mod}; |
199 | my $sym = $ev->{sym}; |
227 | my $sym = $ev->{sym}; |
200 | |
228 | |
|
|
229 | if ($::CFG->{shift_fire_stop}) { |
201 | if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { |
230 | if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { |
202 | $::CONN->user_send ("fire_stop"); |
231 | $::CONN->user_send ("fire_stop"); |
|
|
232 | delete $self->{fire_dir}; |
203 | $res = 1; |
233 | $res = 1; |
|
|
234 | } |
|
|
235 | } else { |
|
|
236 | if (exists $DIR{$sym} && delete $self->{shft}) { |
|
|
237 | $::CONN->user_send ("fire_stop"); |
|
|
238 | delete $self->{fire_dir}; |
|
|
239 | $res = 1; |
|
|
240 | } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? |
|
|
241 | $::CONN->user_send ("fire_stop"); |
|
|
242 | delete $self->{fire_dir}; |
|
|
243 | $res = 1; |
|
|
244 | } |
204 | } |
245 | } |
205 | |
246 | |
206 | if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { |
247 | if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { |
207 | $::CONN->user_send ("run_stop"); |
248 | $::CONN->user_send ("run_stop"); |
208 | $res = 1; |
249 | $res = 1; |
… | |
… | |
216 | |
257 | |
217 | my $focused = $CFClient::UI::FOCUS == $self |
258 | my $focused = $CFClient::UI::FOCUS == $self |
218 | || $CFClient::UI::FOCUS == $self->{completer}{entry}; |
259 | || $CFClient::UI::FOCUS == $self->{completer}{entry}; |
219 | |
260 | |
220 | return |
261 | return |
221 | unless $focused || !$::FAST; |
262 | unless $::CONN && ($focused || !$::FAST); |
222 | |
263 | |
223 | if (delete $self->{need_update}) { |
264 | if (delete $self->{need_update}) { |
|
|
265 | $self->{fow_texture} ||= glGenTexture; |
|
|
266 | |
224 | glNewList $self->{list}; |
267 | glNewList $self->{list}; |
225 | |
268 | |
226 | if ($::MAP) { |
269 | if ($::MAP) { |
227 | my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; |
270 | my $sw = $self->{sw} = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; |
228 | my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; |
271 | my $sh = $self->{sh} = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; |
229 | |
272 | |
230 | my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32; |
273 | my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; |
231 | my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32; |
274 | my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; |
|
|
275 | my $sx0 = $self->{sx0} = ($sx & 31) - 32; $sx = $self->{sx} = ($sx - $sx0) / 32; |
|
|
276 | my $sy0 = $self->{sy0} = ($sy & 31) - 32; $sy = $self->{sy} = ($sy - $sy0) / 32; |
232 | |
277 | |
233 | glPushMatrix; |
278 | glPushMatrix; |
234 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
279 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
235 | |
280 | |
236 | glTranslate $sx0 - 32, $sy0 - 32, 0; |
281 | glTranslate $sx0, $sy0; |
237 | |
282 | |
238 | my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); |
283 | my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); |
239 | |
284 | |
240 | if ($::CFG->{fow_enable}) { |
285 | if ($::CFG->{fow_enable}) { |
241 | if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
286 | if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
… | |
… | |
243 | glConvolutionFilter2D ( |
288 | glConvolutionFilter2D ( |
244 | GL_CONVOLUTION_2D, |
289 | GL_CONVOLUTION_2D, |
245 | GL_ALPHA, |
290 | GL_ALPHA, |
246 | 3, 3, |
291 | 3, 3, |
247 | GL_ALPHA, GL_FLOAT, |
292 | GL_ALPHA, GL_FLOAT, |
248 | pack "f*", |
293 | (pack "f*", @{ $self->{smooth_matrix} }), |
249 | 0.05, 0.13, 0.05, |
|
|
250 | 0.13, 0.30, 0.13, |
|
|
251 | 0.05, 0.13, 0.05, |
|
|
252 | ); |
294 | ); |
253 | glEnable GL_CONVOLUTION_2D; |
295 | glEnable GL_CONVOLUTION_2D; |
254 | } |
296 | } |
255 | |
297 | |
256 | $self->{fow_texture_name} ||= glGenTexture; |
298 | $self->{fow_texture_name} ||= glGenTexture; |
… | |
… | |
441 | |
483 | |
442 | $self->{entry} = new CFClient::UI::Entry |
484 | $self->{entry} = new CFClient::UI::Entry |
443 | on_changed => sub { |
485 | on_changed => sub { |
444 | $self->update_labels; |
486 | $self->update_labels; |
445 | }, |
487 | }, |
|
|
488 | on_button_down => sub { |
|
|
489 | my ($entry, $ev, $x, $y) = @_; |
|
|
490 | |
|
|
491 | if ($ev->{button} == 3) { |
|
|
492 | (new CFClient::UI::Menu |
|
|
493 | items => [ |
|
|
494 | ["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->focus_in }) }] |
|
|
495 | ], |
|
|
496 | )->popup ($ev); |
|
|
497 | return 1; |
|
|
498 | } |
|
|
499 | 0 |
|
|
500 | }, |
446 | on_key_down => sub { |
501 | on_key_down => sub { |
447 | my ($entry, $ev) = @_; |
502 | my ($entry, $ev) = @_; |
448 | |
503 | |
449 | my $self = $entry->{parent}{parent}; |
504 | my $self = $entry->{parent}{parent}; |
450 | |
505 | |
451 | if ($ev->{sym} == 13) { |
506 | if ($ev->{sym} == 13) { |
452 | if (exists $self->{select}) { |
507 | if (exists $self->{select}) { |
453 | $self->{last_command} = $self->{select}; |
508 | $self->{last_command} = $self->{select}; |
454 | $::CONN->user_send ($self->{select}); |
509 | $::CONN->user_send ($self->{select}); |
|
|
510 | |
|
|
511 | unshift @{$self->{history}}, $self->{select}; |
|
|
512 | $self->{hist_ptr} = 0; |
|
|
513 | |
455 | $self->hide; |
514 | $self->hide; |
456 | } |
515 | } |
457 | } elsif ($ev->{sym} == 27) { |
516 | } elsif ($ev->{sym} == 27) { |
|
|
517 | $self->{hist_ptr} = 0; |
458 | $self->hide; |
518 | $self->hide; |
459 | return; |
519 | return; |
460 | } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { |
520 | } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { |
|
|
521 | if ($self->{hist_ptr} > 1) { |
|
|
522 | $self->{hist_ptr}--; |
|
|
523 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
|
|
524 | } elsif ($self->{hist_ptr} > 0) { |
|
|
525 | $self->{hist_ptr}--; |
|
|
526 | $self->{entry}->set_text ($self->{hist_saveback}); |
|
|
527 | } else { |
461 | ++$self->{select_offset} |
528 | ++$self->{select_offset} |
462 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
529 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
|
|
530 | } |
463 | $self->update_labels; |
531 | $self->update_labels; |
464 | } elsif ($ev->{sym} == CFClient::SDLK_UP) { |
532 | } elsif ($ev->{sym} == CFClient::SDLK_UP) { |
|
|
533 | if ($self->{select_offset}) { |
465 | --$self->{select_offset} |
534 | --$self->{select_offset} |
|
|
535 | } else { |
|
|
536 | unless ($self->{hist_ptr}) { |
|
|
537 | $self->{hist_saveback} = $self->{entry}->get_text; |
|
|
538 | } |
|
|
539 | if ($self->{hist_ptr} <= $#{$self->{history}}) { |
466 | if $self->{select_offset}; |
540 | $self->{hist_ptr}++; |
|
|
541 | } |
|
|
542 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]) |
|
|
543 | if exists $self->{history}->[$self->{hist_ptr} - 1]; |
|
|
544 | } |
467 | $self->update_labels; |
545 | $self->update_labels; |
468 | } else { |
546 | } else { |
469 | return 0; |
547 | return 0; |
470 | } |
548 | } |
471 | |
549 | |