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.42 by root, Mon May 29 18:33:23 2006 UTC vs.
Revision 1.58 by elmex, Tue Jun 13 14:35:17 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},
… …
56sub button_down { 63sub button_down {
57 my ($self, $ev, $x, $y) = @_; 64 my ($self, $ev, $x, $y) = @_;
58 65
59 $self->focus_in; 66 $self->focus_in;
60 67
61 if ($ev->{button} == 2) { 68 if ($ev->{button} == 1) {
69 my $x = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale});
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
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;
83
84 } elsif ($ev->{button} == 2) {
62 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 85 my ($ox, $oy) = ($ev->{x}, $ev->{y});
63 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 86 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
64 87
65 $self->{motion} = sub { 88 $self->{motion} = sub {
66 my ($ev, $x, $y) = @_; 89 my ($ev, $x, $y) = @_;
… …
71 $::CFG->{map_shift_y} = $bh + $y - $oy; 94 $::CFG->{map_shift_y} = $bh + $y - $oy;
72 95
73 $self->update; 96 $self->update;
74 }; 97 };
75 } 98 }
99
100 1
76} 101}
77 102
78sub button_up { 103sub button_up {
79 my ($self, $ev, $x, $y) = @_; 104 my ($self, $ev, $x, $y) = @_;
80 105
81 delete $self->{motion}; 106 delete $self->{motion};
107
108 1
82} 109}
83 110
84sub mouse_motion { 111sub mouse_motion {
85 my ($self, $ev, $x, $y) = @_; 112 my ($self, $ev, $x, $y) = @_;
86 113
114 if ($self->{motion}) {
87 $self->{motion}->($ev, $x, $y) if $self->{motion}; 115 $self->{motion}->($ev, $x, $y);
116 } else {
117 return 0;
118 }
119
120 1
88} 121}
89 122
90sub size_request { 123sub size_request {
91 ( 124 (
92 1 + 32 * int $::WIDTH / 32, 125 1 + 32 * int $::WIDTH / 32,
… …
118); 151);
119 152
120sub key_down { 153sub key_down {
121 my ($self, $ev) = @_; 154 my ($self, $ev) = @_;
122 155
123 return unless $::CONN; 156 return 0 unless $::CONN;
124 157
125 my $mod = $ev->{mod}; 158 my $mod = $ev->{mod};
126 my $sym = $ev->{sym}; 159 my $sym = $ev->{sym};
127 my $uni = $ev->{unicode}; 160 my $uni = $ev->{unicode};
128 161
… …
148 $self->{completer}->set_prefix (""); 181 $self->{completer}->set_prefix ("");
149 $self->{completer}->show; 182 $self->{completer}->show;
150 } elsif (exists $DIR{$sym}) { 183 } elsif (exists $DIR{$sym}) {
151 if ($mod & CFClient::KMOD_SHIFT) { 184 if ($mod & CFClient::KMOD_SHIFT) {
152 $self->{shft}++; 185 $self->{shft}++;
186 if ($DIR{$sym}[0] != $self->{fire_dir}) {
153 $::CONN->user_send ("fire $DIR{$sym}[0]"); 187 $::CONN->user_send ("fire $DIR{$sym}[0]");
188 }
189 $self->{fire_dir} = $DIR{$sym}[0];
154 } elsif ($mod & CFClient::KMOD_CTRL) { 190 } elsif ($mod & CFClient::KMOD_CTRL) {
155 $self->{ctrl}++; 191 $self->{ctrl}++;
156 $::CONN->user_send ("run $DIR{$sym}[0]"); 192 $::CONN->user_send ("run $DIR{$sym}[0]");
157 } else { 193 } else {
158 $::CONN->user_send ("$DIR{$sym}[1]"); 194 $::CONN->user_send ("$DIR{$sym}[1]");
159 } 195 }
196 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
197 $::BIND_EDITOR->set_binding (undef, undef, [],
198 sub {
199 my ($mod, $sym, $cmds) = @_;
200 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
201 });
202 $::BIND_EDITOR->start;
203 $::BIND_EDITOR->show;
204 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
205 $::BIND_EDITOR->stop;
206 $::BIND_EDITOR->ask_for_bind_and_commit;
207 $::BIND_EDITOR->hide;
208 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
209 $::CONN->user_send ($_) for @$bind_cmd;
160 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 210 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
161 $self->{completer}->key_down ($ev); 211 $self->{completer}->key_down ($ev);
162 $self->{completer}->show; 212 $self->{completer}->show;
213 } else {
214 return 0;
215 }
216
163 } 217 1
164} 218}
165 219
166sub key_up { 220sub key_up {
167 my ($self, $ev) = @_; 221 my ($self, $ev) = @_;
168 222
223 my $res = 0;
169 my $mod = $ev->{mod}; 224 my $mod = $ev->{mod};
170 my $sym = $ev->{sym}; 225 my $sym = $ev->{sym};
171 226
227 if ($::CFG->{shift_fire_stop}) {
172 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 228 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
173 $::CONN->user_send ("fire_stop"); 229 $::CONN->user_send ("fire_stop");
230 delete $self->{fire_dir};
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 }
174 } 243 }
244
175 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 245 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
176 $::CONN->user_send ("run_stop"); 246 $::CONN->user_send ("run_stop");
247 $res = 1;
177 } 248 }
249
250 $res
178} 251}
179 252
180sub draw { 253sub draw {
181 my ($self) = @_; 254 my ($self) = @_;
182 255
… …
188 261
189 if (delete $self->{need_update}) { 262 if (delete $self->{need_update}) {
190 glNewList $self->{list}; 263 glNewList $self->{list};
191 264
192 if ($::MAP) { 265 if ($::MAP) {
193 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 266 my $sw = $self->{sw} = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
194 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 267 my $sh = $self->{sh} = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
195 268
196 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};
197 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;
198 273
199 glPushMatrix; 274 glPushMatrix;
200 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 275 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
201 276
202 glTranslate $sx0 - 32, $sy0 - 32, 0; 277 glTranslate $sx0, $sy0;
203 278
204 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);
205 280
206 if ($::CFG->{fow_enable}) { 281 if ($::CFG->{fow_enable}) {
207 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
… …
209 glConvolutionFilter2D ( 284 glConvolutionFilter2D (
210 GL_CONVOLUTION_2D, 285 GL_CONVOLUTION_2D,
211 GL_ALPHA, 286 GL_ALPHA,
212 3, 3, 287 3, 3,
213 GL_ALPHA, GL_FLOAT, 288 GL_ALPHA, GL_FLOAT,
214 pack "f*", 289 (pack "f*", @{ $self->{smooth_matrix} }),
215 0.05, 0.13, 0.05,
216 0.13, 0.30, 0.13,
217 0.05, 0.13, 0.05,
218 ); 290 );
219 glEnable GL_CONVOLUTION_2D; 291 glEnable GL_CONVOLUTION_2D;
220 } 292 }
221 293
222 $self->{fow_texture_name} ||= glGenTexture; 294 $self->{fow_texture_name} ||= glGenTexture;
… …
277# 349#
278# $label->show; 350# $label->show;
279# $label->update; 351# $label->update;
280# 352#
281# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub { 353# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
282# $label->move ( 354# $label->move_abs (
283# ($::WIDTH - $label->{w}) * 0.5, 355# ($::WIDTH - $label->{w}) * 0.5,
284# ($::HEIGHT - $label->{h}) * 0.5, 356# ($::HEIGHT - $label->{h}) * 0.5,
285# ); 357# );
286# }); 358# });
287# 359#
… …
407 479
408 $self->{entry} = new CFClient::UI::Entry 480 $self->{entry} = new CFClient::UI::Entry
409 on_changed => sub { 481 on_changed => sub {
410 $self->update_labels; 482 $self->update_labels;
411 }, 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 },
412 on_key_down => sub { 497 on_key_down => sub {
413 my ($entry, $ev) = @_; 498 my ($entry, $ev) = @_;
414 499
415 my $self = $entry->{parent}{parent}; 500 my $self = $entry->{parent}{parent};
416 501
417 if ($ev->{sym} == 13) { 502 if ($ev->{sym} == 13) {
418 if (exists $self->{select}) { 503 if (exists $self->{select}) {
419 $self->{last_command} = $self->{select}; 504 $self->{last_command} = $self->{select};
420 $::CONN->user_send ($self->{select}); 505 $::CONN->user_send ($self->{select});
506
507 unshift @{$self->{history}}, $self->{select};
508 $self->{hist_ptr} = 0;
509
421 $self->hide; 510 $self->hide;
422 } 511 }
423 } elsif ($ev->{sym} == 27) { 512 } elsif ($ev->{sym} == 27) {
513 $self->{hist_ptr} = 0;
424 $self->hide; 514 $self->hide;
425 return; 515 return;
426 } 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 {
427 ++$self->{select_offset} 524 ++$self->{select_offset}
428 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 525 if $self->{select_offset} < $#{ $self->{last_match} || [] };
526 }
429 $self->update_labels; 527 $self->update_labels;
430 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 528 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
529 if ($self->{select_offset}) {
431 --$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}}) {
432 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 }
433 $self->update_labels; 541 $self->update_labels;
434 } else { 542 } else {
435 return 0; 543 return 0;
436 } 544 }
437 545
… …
456 564
457sub size_allocate { 565sub size_allocate {
458 my ($self, $w, $h) = @_; 566 my ($self, $w, $h) = @_;
459 567
460 $self->SUPER::size_allocate ($w, $h); 568 $self->SUPER::size_allocate ($w, $h);
461 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 569 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
462} 570}
463 571
464sub show { 572sub show {
465 my ($self) = @_; 573 my ($self) = @_;
466 574
… …
476} 584}
477 585
478sub key_down { 586sub key_down {
479 my ($self, $ev) = @_; 587 my ($self, $ev) = @_;
480 588
481 $self->{entry}->key_down ($ev); 589 $self->{entry}->key_down ($ev)
482} 590}
483 591
484sub update_labels { 592sub update_labels {
485 my ($self) = @_; 593 my ($self) = @_;
486 594

Diff Legend

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