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.43 by elmex, Mon May 29 19:30:28 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]");
159 } 197 }
160 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { 198 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
161 CFClient::Recorder::start (1); 199 $::BIND_EDITOR->set_binding (undef, undef, [],
200 sub {
201 my ($mod, $sym, $cmds) = @_;
202 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
203 });
204 $::BIND_EDITOR->start;
205 $::BIND_EDITOR->show;
162 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { 206 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
163 CFClient::Recorder::stop (1); 207 $::BIND_EDITOR->stop;
208 $::BIND_EDITOR->ask_for_bind_and_commit;
209 $::BIND_EDITOR->hide;
164 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) { 210 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
165 $::CONN->user_send ($_) for @$bind_cmd; 211 $::CONN->user_send ($_) for @$bind_cmd;
166 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 212 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
167 $self->{completer}->key_down ($ev); 213 $self->{completer}->key_down ($ev);
168 $self->{completer}->show; 214 $self->{completer}->show;
215 } else {
216 return 0;
217 }
218
169 } 219 1
170} 220}
171 221
172sub key_up { 222sub key_up {
173 my ($self, $ev) = @_; 223 my ($self, $ev) = @_;
174 224
225 my $res = 0;
175 my $mod = $ev->{mod}; 226 my $mod = $ev->{mod};
176 my $sym = $ev->{sym}; 227 my $sym = $ev->{sym};
177 228
229 if ($::CFG->{shift_fire_stop}) {
178 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 230 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
179 $::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 }
180 } 245 }
246
181 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 247 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
182 $::CONN->user_send ("run_stop"); 248 $::CONN->user_send ("run_stop");
249 $res = 1;
183 } 250 }
251
252 $res
184} 253}
185 254
186sub draw { 255sub draw {
187 my ($self) = @_; 256 my ($self) = @_;
188 257
189 my $focused = $CFClient::UI::FOCUS == $self 258 my $focused = $CFClient::UI::FOCUS == $self
190 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 259 || $CFClient::UI::FOCUS == $self->{completer}{entry};
191 260
192 return 261 return
193 unless $focused || !$::FAST; 262 unless $::CONN && ($focused || !$::FAST);
194 263
195 if (delete $self->{need_update}) { 264 if (delete $self->{need_update}) {
265 $self->{fow_texture} ||= glGenTexture;
266
196 glNewList $self->{list}; 267 glNewList $self->{list};
197 268
198 if ($::MAP) { 269 if ($::MAP) {
199 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 270 my $sw = $self->{sw} = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
200 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 271 my $sh = $self->{sh} = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
201 272
202 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};
203 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;
204 277
205 glPushMatrix; 278 glPushMatrix;
206 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 279 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
207 280
208 glTranslate $sx0 - 32, $sy0 - 32, 0; 281 glTranslate $sx0, $sy0;
209 282
210 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);
211 284
212 if ($::CFG->{fow_enable}) { 285 if ($::CFG->{fow_enable}) {
213 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
… …
215 glConvolutionFilter2D ( 288 glConvolutionFilter2D (
216 GL_CONVOLUTION_2D, 289 GL_CONVOLUTION_2D,
217 GL_ALPHA, 290 GL_ALPHA,
218 3, 3, 291 3, 3,
219 GL_ALPHA, GL_FLOAT, 292 GL_ALPHA, GL_FLOAT,
220 pack "f*", 293 (pack "f*", @{ $self->{smooth_matrix} }),
221 0.05, 0.13, 0.05,
222 0.13, 0.30, 0.13,
223 0.05, 0.13, 0.05,
224 ); 294 );
225 glEnable GL_CONVOLUTION_2D; 295 glEnable GL_CONVOLUTION_2D;
226 } 296 }
227 297
228 $self->{fow_texture_name} ||= glGenTexture; 298 $self->{fow_texture_name} ||= glGenTexture;
… …
283# 353#
284# $label->show; 354# $label->show;
285# $label->update; 355# $label->update;
286# 356#
287# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub { 357# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
288# $label->move ( 358# $label->move_abs (
289# ($::WIDTH - $label->{w}) * 0.5, 359# ($::WIDTH - $label->{w}) * 0.5,
290# ($::HEIGHT - $label->{h}) * 0.5, 360# ($::HEIGHT - $label->{h}) * 0.5,
291# ); 361# );
292# }); 362# });
293# 363#
… …
413 483
414 $self->{entry} = new CFClient::UI::Entry 484 $self->{entry} = new CFClient::UI::Entry
415 on_changed => sub { 485 on_changed => sub {
416 $self->update_labels; 486 $self->update_labels;
417 }, 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 },
418 on_key_down => sub { 501 on_key_down => sub {
419 my ($entry, $ev) = @_; 502 my ($entry, $ev) = @_;
420 503
421 my $self = $entry->{parent}{parent}; 504 my $self = $entry->{parent}{parent};
422 505
423 if ($ev->{sym} == 13) { 506 if ($ev->{sym} == 13) {
424 if (exists $self->{select}) { 507 if (exists $self->{select}) {
425 $self->{last_command} = $self->{select}; 508 $self->{last_command} = $self->{select};
426 $::CONN->user_send ($self->{select}); 509 $::CONN->user_send ($self->{select});
510
511 unshift @{$self->{history}}, $self->{select};
512 $self->{hist_ptr} = 0;
513
427 $self->hide; 514 $self->hide;
428 } 515 }
429 } elsif ($ev->{sym} == 27) { 516 } elsif ($ev->{sym} == 27) {
517 $self->{hist_ptr} = 0;
430 $self->hide; 518 $self->hide;
431 return; 519 return;
432 } 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 {
433 ++$self->{select_offset} 528 ++$self->{select_offset}
434 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 529 if $self->{select_offset} < $#{ $self->{last_match} || [] };
530 }
435 $self->update_labels; 531 $self->update_labels;
436 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 532 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
533 if ($self->{select_offset}) {
437 --$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}}) {
438 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 }
439 $self->update_labels; 545 $self->update_labels;
440 } else { 546 } else {
441 return 0; 547 return 0;
442 } 548 }
443 549
… …
462 568
463sub size_allocate { 569sub size_allocate {
464 my ($self, $w, $h) = @_; 570 my ($self, $w, $h) = @_;
465 571
466 $self->SUPER::size_allocate ($w, $h); 572 $self->SUPER::size_allocate ($w, $h);
467 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 573 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
468} 574}
469 575
470sub show { 576sub show {
471 my ($self) = @_; 577 my ($self) = @_;
472 578
… …
482} 588}
483 589
484sub key_down { 590sub key_down {
485 my ($self, $ev) = @_; 591 my ($self, $ev) = @_;
486 592
487 $self->{entry}->key_down ($ev); 593 $self->{entry}->key_down ($ev)
488} 594}
489 595
490sub update_labels { 596sub update_labels {
491 my ($self) = @_; 597 my ($self) = @_;
492 598

Diff Legend

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