ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/MapWidget.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.51 by root, Thu Jun 8 01:51:32 2006 UTC vs.
Revision 1.58 by elmex, Tue Jun 13 14:35:17 2006 UTC

… …
64 my ($self, $ev, $x, $y) = @_; 64 my ($self, $ev, $x, $y) = @_;
65 65
66 $self->focus_in; 66 $self->focus_in;
67 67
68 if ($ev->{button} == 1) { 68 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; 69 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; 70 my $y = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale});
71
72 $x += int 0.5 * ($::MAP->w - $self->{sw} - 1);
73 $y += int 0.5 * ($::MAP->h - $self->{sh} - 1);
74 74
75 $::CONN->send (sprintf "lookat %d %d", $fx, $fy); 75 $x -= int 0.5 * $::MAP->w;
76 $y -= int 0.5 * $::MAP->h;
77
78 $x += 1;
79 $y += 1;
80
81 $::CONN->lookat ($x, $y)
82 if $::CONN;
76 83
77 } elsif ($ev->{button} == 2) { 84 } elsif ($ev->{button} == 2) {
78 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 85 my ($ox, $oy) = ($ev->{x}, $ev->{y});
79 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 86 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
80 87
… …
174 $self->{completer}->set_prefix (""); 181 $self->{completer}->set_prefix ("");
175 $self->{completer}->show; 182 $self->{completer}->show;
176 } elsif (exists $DIR{$sym}) { 183 } elsif (exists $DIR{$sym}) {
177 if ($mod & CFClient::KMOD_SHIFT) { 184 if ($mod & CFClient::KMOD_SHIFT) {
178 $self->{shft}++; 185 $self->{shft}++;
186 if ($DIR{$sym}[0] != $self->{fire_dir}) {
179 $::CONN->user_send ("fire $DIR{$sym}[0]"); 187 $::CONN->user_send ("fire $DIR{$sym}[0]");
188 }
189 $self->{fire_dir} = $DIR{$sym}[0];
180 } elsif ($mod & CFClient::KMOD_CTRL) { 190 } elsif ($mod & CFClient::KMOD_CTRL) {
181 $self->{ctrl}++; 191 $self->{ctrl}++;
182 $::CONN->user_send ("run $DIR{$sym}[0]"); 192 $::CONN->user_send ("run $DIR{$sym}[0]");
183 } else { 193 } else {
184 $::CONN->user_send ("$DIR{$sym}[1]"); 194 $::CONN->user_send ("$DIR{$sym}[1]");
… …
212 222
213 my $res = 0; 223 my $res = 0;
214 my $mod = $ev->{mod}; 224 my $mod = $ev->{mod};
215 my $sym = $ev->{sym}; 225 my $sym = $ev->{sym};
216 226
227 if ($::CFG->{shift_fire_stop}) {
217 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 228 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
218 $::CONN->user_send ("fire_stop"); 229 $::CONN->user_send ("fire_stop");
230 delete $self->{fire_dir};
219 $res = 1; 231 $res = 1;
232 }
233 } else {
234 if (exists $DIR{$sym} && delete $self->{shft}) {
235 $::CONN->user_send ("fire_stop");
236 delete $self->{fire_dir};
237 $res = 1;
238 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
239 $::CONN->user_send ("fire_stop");
240 delete $self->{fire_dir};
241 $res = 1;
242 }
220 } 243 }
221 244
222 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 245 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
223 $::CONN->user_send ("run_stop"); 246 $::CONN->user_send ("run_stop");
224 $res = 1; 247 $res = 1;
… …
238 261
239 if (delete $self->{need_update}) { 262 if (delete $self->{need_update}) {
240 glNewList $self->{list}; 263 glNewList $self->{list};
241 264
242 if ($::MAP) { 265 if ($::MAP) {
243 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 266 my $sw = $self->{sw} = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
244 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 267 my $sh = $self->{sh} = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
245 268
246 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32; 269 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; 270 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale};
271 my $sx0 = $self->{sx0} = ($sx & 31) - 32; $sx = $self->{sx} = ($sx - $sx0) / 32;
272 my $sy0 = $self->{sy0} = ($sy & 31) - 32; $sy = $self->{sy} = ($sy - $sy0) / 32;
248 273
249 glPushMatrix; 274 glPushMatrix;
250 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 275 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
251 276
252 glTranslate $sx0 - 32, $sy0 - 32, 0; 277 glTranslate $sx0, $sy0;
253 278
254 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 279 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
255 280
256 if ($::CFG->{fow_enable}) { 281 if ($::CFG->{fow_enable}) {
257 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 282 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
… …
454 479
455 $self->{entry} = new CFClient::UI::Entry 480 $self->{entry} = new CFClient::UI::Entry
456 on_changed => sub { 481 on_changed => sub {
457 $self->update_labels; 482 $self->update_labels;
458 }, 483 },
484 on_button_down => sub {
485 my ($entry, $ev, $x, $y) = @_;
486
487 if ($ev->{button} == 3) {
488 (new CFClient::UI::Menu
489 items => [
490 ["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->focus_in }) }]
491 ],
492 )->popup ($ev);
493 return 1;
494 }
495 0
496 },
459 on_key_down => sub { 497 on_key_down => sub {
460 my ($entry, $ev) = @_; 498 my ($entry, $ev) = @_;
461 499
462 my $self = $entry->{parent}{parent}; 500 my $self = $entry->{parent}{parent};
463 501
464 if ($ev->{sym} == 13) { 502 if ($ev->{sym} == 13) {
465 if (exists $self->{select}) { 503 if (exists $self->{select}) {
466 $self->{last_command} = $self->{select}; 504 $self->{last_command} = $self->{select};
467 $::CONN->user_send ($self->{select}); 505 $::CONN->user_send ($self->{select});
506
507 unshift @{$self->{history}}, $self->{select};
508 $self->{hist_ptr} = 0;
509
468 $self->hide; 510 $self->hide;
469 } 511 }
470 } elsif ($ev->{sym} == 27) { 512 } elsif ($ev->{sym} == 27) {
513 $self->{hist_ptr} = 0;
471 $self->hide; 514 $self->hide;
472 return; 515 return;
473 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 516 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
517 if ($self->{hist_ptr} > 1) {
518 $self->{hist_ptr}--;
519 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
520 } elsif ($self->{hist_ptr} > 0) {
521 $self->{hist_ptr}--;
522 $self->{entry}->set_text ($self->{hist_saveback});
523 } else {
474 ++$self->{select_offset} 524 ++$self->{select_offset}
475 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 525 if $self->{select_offset} < $#{ $self->{last_match} || [] };
526 }
476 $self->update_labels; 527 $self->update_labels;
477 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 528 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
529 if ($self->{select_offset}) {
478 --$self->{select_offset} 530 --$self->{select_offset}
531 } else {
532 unless ($self->{hist_ptr}) {
533 $self->{hist_saveback} = $self->{entry}->get_text;
534 }
535 if ($self->{hist_ptr} <= $#{$self->{history}}) {
479 if $self->{select_offset}; 536 $self->{hist_ptr}++;
537 }
538 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
539 if exists $self->{history}->[$self->{hist_ptr} - 1];
540 }
480 $self->update_labels; 541 $self->update_labels;
481 } else { 542 } else {
482 return 0; 543 return 0;
483 } 544 }
484 545

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines