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.45 by elmex, Tue May 30 14:35:09 2006 UTC vs.
Revision 1.59 by root, Wed Jun 14 16:20:22 2006 UTC

… …
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
56sub button_down { 63sub 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) = @_;
… …
71 $::CFG->{map_shift_y} = $bh + $y - $oy; 96 $::CFG->{map_shift_y} = $bh + $y - $oy;
72 97
73 $self->update; 98 $self->update;
74 }; 99 };
75 } 100 }
101
102 1
76} 103}
77 104
78sub button_up { 105sub button_up {
79 my ($self, $ev, $x, $y) = @_; 106 my ($self, $ev, $x, $y) = @_;
80 107
81 delete $self->{motion}; 108 delete $self->{motion};
109
110 1
82} 111}
83 112
84sub mouse_motion { 113sub mouse_motion {
85 my ($self, $ev, $x, $y) = @_; 114 my ($self, $ev, $x, $y) = @_;
86 115
116 if ($self->{motion}) {
87 $self->{motion}->($ev, $x, $y) if $self->{motion}; 117 $self->{motion}->($ev, $x, $y);
118 } else {
119 return 0;
120 }
121
122 1
88} 123}
89 124
90sub size_request { 125sub size_request {
91 ( 126 (
92 1 + 32 * int $::WIDTH / 32, 127 1 + 32 * int $::WIDTH / 32,
… …
118); 153);
119 154
120sub key_down { 155sub key_down {
121 my ($self, $ev) = @_; 156 my ($self, $ev) = @_;
122 157
123 return unless $::CONN; 158 return 0 unless $::CONN;
124 159
125 my $mod = $ev->{mod}; 160 my $mod = $ev->{mod};
126 my $sym = $ev->{sym}; 161 my $sym = $ev->{sym};
127 my $uni = $ev->{unicode}; 162 my $uni = $ev->{unicode};
128 163
… …
148 $self->{completer}->set_prefix (""); 183 $self->{completer}->set_prefix ("");
149 $self->{completer}->show; 184 $self->{completer}->show;
150 } elsif (exists $DIR{$sym}) { 185 } elsif (exists $DIR{$sym}) {
151 if ($mod & CFClient::KMOD_SHIFT) { 186 if ($mod & CFClient::KMOD_SHIFT) {
152 $self->{shft}++; 187 $self->{shft}++;
188 if ($DIR{$sym}[0] != $self->{fire_dir}) {
153 $::CONN->user_send ("fire $DIR{$sym}[0]"); 189 $::CONN->user_send ("fire $DIR{$sym}[0]");
190 }
191 $self->{fire_dir} = $DIR{$sym}[0];
154 } elsif ($mod & CFClient::KMOD_CTRL) { 192 } elsif ($mod & CFClient::KMOD_CTRL) {
155 $self->{ctrl}++; 193 $self->{ctrl}++;
156 $::CONN->user_send ("run $DIR{$sym}[0]"); 194 $::CONN->user_send ("run $DIR{$sym}[0]");
157 } else { 195 } else {
158 $::CONN->user_send ("$DIR{$sym}[1]"); 196 $::CONN->user_send ("$DIR{$sym}[1]");
… …
165 }); 203 });
166 $::BIND_EDITOR->start; 204 $::BIND_EDITOR->start;
167 $::BIND_EDITOR->show; 205 $::BIND_EDITOR->show;
168 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { 206 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
169 $::BIND_EDITOR->stop; 207 $::BIND_EDITOR->stop;
170 $::BIND_EDITOR->ask_for_bind (1); 208 $::BIND_EDITOR->ask_for_bind_and_commit;
171 $::BIND_EDITOR->hide; 209 $::BIND_EDITOR->hide;
172 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) { 210 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
173 $::CONN->user_send ($_) for @$bind_cmd; 211 $::CONN->user_send ($_) for @$bind_cmd;
174 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 212 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
175 $self->{completer}->key_down ($ev); 213 $self->{completer}->key_down ($ev);
176 $self->{completer}->show; 214 $self->{completer}->show;
215 } else {
216 return 0;
217 }
218
177 } 219 1
178} 220}
179 221
180sub key_up { 222sub key_up {
181 my ($self, $ev) = @_; 223 my ($self, $ev) = @_;
182 224
225 my $res = 0;
183 my $mod = $ev->{mod}; 226 my $mod = $ev->{mod};
184 my $sym = $ev->{sym}; 227 my $sym = $ev->{sym};
185 228
229 if ($::CFG->{shift_fire_stop}) {
186 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 230 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
187 $::CONN->user_send ("fire_stop"); 231 $::CONN->user_send ("fire_stop");
232 delete $self->{fire_dir};
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 }
188 } 245 }
246
189 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 247 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
190 $::CONN->user_send ("run_stop"); 248 $::CONN->user_send ("run_stop");
249 $res = 1;
191 } 250 }
251
252 $res
192} 253}
193 254
194sub draw { 255sub draw {
195 my ($self) = @_; 256 my ($self) = @_;
196 257
197 my $focused = $CFClient::UI::FOCUS == $self 258 my $focused = $CFClient::UI::FOCUS == $self
198 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 259 || $CFClient::UI::FOCUS == $self->{completer}{entry};
199 260
200 return 261 return
201 unless $focused || !$::FAST; 262 unless $::CONN && ($focused || !$::FAST);
202 263
203 if (delete $self->{need_update}) { 264 if (delete $self->{need_update}) {
265 $self->{fow_texture} ||= glGenTexture;
266
204 glNewList $self->{list}; 267 glNewList $self->{list};
205 268
206 if ($::MAP) { 269 if ($::MAP) {
207 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 270 my $sw = $self->{sw} = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
208 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 271 my $sh = $self->{sh} = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
209 272
210 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};
211 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;
212 277
213 glPushMatrix; 278 glPushMatrix;
214 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 279 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
215 280
216 glTranslate $sx0 - 32, $sy0 - 32, 0; 281 glTranslate $sx0, $sy0;
217 282
218 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);
219 284
220 if ($::CFG->{fow_enable}) { 285 if ($::CFG->{fow_enable}) {
221 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
… …
223 glConvolutionFilter2D ( 288 glConvolutionFilter2D (
224 GL_CONVOLUTION_2D, 289 GL_CONVOLUTION_2D,
225 GL_ALPHA, 290 GL_ALPHA,
226 3, 3, 291 3, 3,
227 GL_ALPHA, GL_FLOAT, 292 GL_ALPHA, GL_FLOAT,
228 pack "f*", 293 (pack "f*", @{ $self->{smooth_matrix} }),
229 0.05, 0.13, 0.05,
230 0.13, 0.30, 0.13,
231 0.05, 0.13, 0.05,
232 ); 294 );
233 glEnable GL_CONVOLUTION_2D; 295 glEnable GL_CONVOLUTION_2D;
234 } 296 }
235 297
236 $self->{fow_texture_name} ||= glGenTexture; 298 $self->{fow_texture_name} ||= glGenTexture;
… …
421 483
422 $self->{entry} = new CFClient::UI::Entry 484 $self->{entry} = new CFClient::UI::Entry
423 on_changed => sub { 485 on_changed => sub {
424 $self->update_labels; 486 $self->update_labels;
425 }, 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 },
426 on_key_down => sub { 501 on_key_down => sub {
427 my ($entry, $ev) = @_; 502 my ($entry, $ev) = @_;
428 503
429 my $self = $entry->{parent}{parent}; 504 my $self = $entry->{parent}{parent};
430 505
431 if ($ev->{sym} == 13) { 506 if ($ev->{sym} == 13) {
432 if (exists $self->{select}) { 507 if (exists $self->{select}) {
433 $self->{last_command} = $self->{select}; 508 $self->{last_command} = $self->{select};
434 $::CONN->user_send ($self->{select}); 509 $::CONN->user_send ($self->{select});
510
511 unshift @{$self->{history}}, $self->{select};
512 $self->{hist_ptr} = 0;
513
435 $self->hide; 514 $self->hide;
436 } 515 }
437 } elsif ($ev->{sym} == 27) { 516 } elsif ($ev->{sym} == 27) {
517 $self->{hist_ptr} = 0;
438 $self->hide; 518 $self->hide;
439 return; 519 return;
440 } 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 {
441 ++$self->{select_offset} 528 ++$self->{select_offset}
442 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 529 if $self->{select_offset} < $#{ $self->{last_match} || [] };
530 }
443 $self->update_labels; 531 $self->update_labels;
444 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 532 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
533 if ($self->{select_offset}) {
445 --$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}}) {
446 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 }
447 $self->update_labels; 545 $self->update_labels;
448 } else { 546 } else {
449 return 0; 547 return 0;
450 } 548 }
451 549
… …
490} 588}
491 589
492sub key_down { 590sub key_down {
493 my ($self, $ev) = @_; 591 my ($self, $ev) = @_;
494 592
495 $self->{entry}->key_down ($ev); 593 $self->{entry}->key_down ($ev)
496} 594}
497 595
498sub update_labels { 596sub update_labels {
499 my ($self) = @_; 597 my ($self) = @_;
500 598

Diff Legend

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