… | |
… | |
61 | } |
61 | } |
62 | |
62 | |
63 | sub button_down { |
63 | sub button_down { |
64 | my ($self, $ev, $x, $y) = @_; |
64 | my ($self, $ev, $x, $y) = @_; |
65 | |
65 | |
|
|
66 | return unless $::CONN; |
|
|
67 | |
66 | $self->focus_in; |
68 | $self->focus_in; |
67 | |
69 | |
68 | if ($ev->{button} == 1) { |
70 | if ($ev->{button} == 1) { |
69 | my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; |
|
|
70 | my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; |
|
|
71 | |
|
|
72 | my $fx = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}) - 0.5 * $sw + 0.99; |
71 | my $x = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}); |
73 | my $fy = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}) - 0.5 * $sh + 0.99; |
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); |
74 | |
76 | |
75 | $::CONN->send (sprintf "lookat %d %d", $fx, $fy); |
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; |
76 | |
85 | |
77 | } elsif ($ev->{button} == 2) { |
86 | } elsif ($ev->{button} == 2) { |
78 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
87 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
79 | my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); |
88 | my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); |
80 | |
89 | |
… | |
… | |
174 | $self->{completer}->set_prefix (""); |
183 | $self->{completer}->set_prefix (""); |
175 | $self->{completer}->show; |
184 | $self->{completer}->show; |
176 | } elsif (exists $DIR{$sym}) { |
185 | } elsif (exists $DIR{$sym}) { |
177 | if ($mod & CFClient::KMOD_SHIFT) { |
186 | if ($mod & CFClient::KMOD_SHIFT) { |
178 | $self->{shft}++; |
187 | $self->{shft}++; |
|
|
188 | if ($DIR{$sym}[0] != $self->{fire_dir}) { |
179 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
189 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
|
|
190 | } |
|
|
191 | $self->{fire_dir} = $DIR{$sym}[0]; |
180 | } elsif ($mod & CFClient::KMOD_CTRL) { |
192 | } elsif ($mod & CFClient::KMOD_CTRL) { |
181 | $self->{ctrl}++; |
193 | $self->{ctrl}++; |
182 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
194 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
183 | } else { |
195 | } else { |
184 | $::CONN->user_send ("$DIR{$sym}[1]"); |
196 | $::CONN->user_send ("$DIR{$sym}[1]"); |
… | |
… | |
212 | |
224 | |
213 | my $res = 0; |
225 | my $res = 0; |
214 | my $mod = $ev->{mod}; |
226 | my $mod = $ev->{mod}; |
215 | my $sym = $ev->{sym}; |
227 | my $sym = $ev->{sym}; |
216 | |
228 | |
|
|
229 | if ($::CFG->{shift_fire_stop}) { |
217 | if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { |
230 | if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { |
218 | $::CONN->user_send ("fire_stop"); |
231 | $::CONN->user_send ("fire_stop"); |
|
|
232 | delete $self->{fire_dir}; |
219 | $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 | } |
220 | } |
245 | } |
221 | |
246 | |
222 | if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { |
247 | if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { |
223 | $::CONN->user_send ("run_stop"); |
248 | $::CONN->user_send ("run_stop"); |
224 | $res = 1; |
249 | $res = 1; |
… | |
… | |
232 | |
257 | |
233 | my $focused = $CFClient::UI::FOCUS == $self |
258 | my $focused = $CFClient::UI::FOCUS == $self |
234 | || $CFClient::UI::FOCUS == $self->{completer}{entry}; |
259 | || $CFClient::UI::FOCUS == $self->{completer}{entry}; |
235 | |
260 | |
236 | return |
261 | return |
237 | unless $focused || !$::FAST; |
262 | unless $::CONN && ($focused || !$::FAST); |
238 | |
263 | |
239 | if (delete $self->{need_update}) { |
264 | if (delete $self->{need_update}) { |
|
|
265 | $self->{fow_texture} ||= glGenTexture; |
|
|
266 | |
240 | glNewList $self->{list}; |
267 | glNewList $self->{list}; |
241 | |
268 | |
242 | if ($::MAP) { |
269 | if ($::MAP) { |
243 | my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; |
270 | my $sw = $self->{sw} = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; |
244 | my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; |
271 | my $sh = $self->{sh} = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; |
245 | |
272 | |
246 | 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}; |
247 | 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; |
248 | |
277 | |
249 | glPushMatrix; |
278 | glPushMatrix; |
250 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
279 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
251 | |
280 | |
252 | glTranslate $sx0 - 32, $sy0 - 32, 0; |
281 | glTranslate $sx0, $sy0; |
253 | |
282 | |
254 | 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); |
255 | |
284 | |
256 | if ($::CFG->{fow_enable}) { |
285 | if ($::CFG->{fow_enable}) { |
257 | 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 |
… | |
… | |
453 | ]; |
482 | ]; |
454 | |
483 | |
455 | $self->{entry} = new CFClient::UI::Entry |
484 | $self->{entry} = new CFClient::UI::Entry |
456 | on_changed => sub { |
485 | on_changed => sub { |
457 | $self->update_labels; |
486 | $self->update_labels; |
|
|
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 |
458 | }, |
500 | }, |
459 | on_key_down => sub { |
501 | on_key_down => sub { |
460 | my ($entry, $ev) = @_; |
502 | my ($entry, $ev) = @_; |
461 | |
503 | |
462 | my $self = $entry->{parent}{parent}; |
504 | my $self = $entry->{parent}{parent}; |