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.41 by root, Sun May 28 02:31:03 2006 UTC vs.
Revision 1.57 by elmex, Tue Jun 13 11:01:04 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
… …
155 $self->{ctrl}++; 188 $self->{ctrl}++;
156 $::CONN->user_send ("run $DIR{$sym}[0]"); 189 $::CONN->user_send ("run $DIR{$sym}[0]");
157 } else { 190 } else {
158 $::CONN->user_send ("$DIR{$sym}[1]"); 191 $::CONN->user_send ("$DIR{$sym}[1]");
159 } 192 }
160 } elsif ($ev->{unicode}) { 193 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
194 $::BIND_EDITOR->set_binding (undef, undef, [],
195 sub {
196 my ($mod, $sym, $cmds) = @_;
197 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
198 });
199 $::BIND_EDITOR->start;
200 $::BIND_EDITOR->show;
201 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
202 $::BIND_EDITOR->stop;
203 $::BIND_EDITOR->ask_for_bind_and_commit;
204 $::BIND_EDITOR->hide;
205 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
206 $::CONN->user_send ($_) for @$bind_cmd;
207 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
161 $self->{completer}->key_down ($ev); 208 $self->{completer}->key_down ($ev);
162 $self->{completer}->show; 209 $self->{completer}->show;
210 } else {
211 return 0;
212 }
213
163 } 214 1
164} 215}
165 216
166sub key_up { 217sub key_up {
167 my ($self, $ev) = @_; 218 my ($self, $ev) = @_;
168 219
220 my $res = 0;
169 my $mod = $ev->{mod}; 221 my $mod = $ev->{mod};
170 my $sym = $ev->{sym}; 222 my $sym = $ev->{sym};
171 223
172 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 224 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
173 $::CONN->user_send ("fire_stop"); 225 $::CONN->user_send ("fire_stop");
226 $res = 1;
174 } 227 }
228
175 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 229 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
176 $::CONN->user_send ("run_stop"); 230 $::CONN->user_send ("run_stop");
231 $res = 1;
177 } 232 }
233
234 $res
178} 235}
179 236
180sub draw { 237sub draw {
181 my ($self) = @_; 238 my ($self) = @_;
182 239
… …
188 245
189 if (delete $self->{need_update}) { 246 if (delete $self->{need_update}) {
190 glNewList $self->{list}; 247 glNewList $self->{list};
191 248
192 if ($::MAP) { 249 if ($::MAP) {
193 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 250 my $sw = $self->{sw} = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
194 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 251 my $sh = $self->{sh} = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
195 252
196 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32; 253 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; 254 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale};
255 my $sx0 = $self->{sx0} = ($sx & 31) - 32; $sx = $self->{sx} = ($sx - $sx0) / 32;
256 my $sy0 = $self->{sy0} = ($sy & 31) - 32; $sy = $self->{sy} = ($sy - $sy0) / 32;
198 257
199 glPushMatrix; 258 glPushMatrix;
200 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 259 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
201 260
202 glTranslate $sx0 - 32, $sy0 - 32, 0; 261 glTranslate $sx0, $sy0;
203 262
204 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 263 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
205 264
206 if ($::CFG->{fow_enable}) { 265 if ($::CFG->{fow_enable}) {
207 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 266 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
… …
209 glConvolutionFilter2D ( 268 glConvolutionFilter2D (
210 GL_CONVOLUTION_2D, 269 GL_CONVOLUTION_2D,
211 GL_ALPHA, 270 GL_ALPHA,
212 3, 3, 271 3, 3,
213 GL_ALPHA, GL_FLOAT, 272 GL_ALPHA, GL_FLOAT,
214 pack "f*", 273 (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 ); 274 );
219 glEnable GL_CONVOLUTION_2D; 275 glEnable GL_CONVOLUTION_2D;
220 } 276 }
221 277
222 $self->{fow_texture_name} ||= glGenTexture; 278 $self->{fow_texture_name} ||= glGenTexture;
… …
277# 333#
278# $label->show; 334# $label->show;
279# $label->update; 335# $label->update;
280# 336#
281# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub { 337# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
282# $label->move ( 338# $label->move_abs (
283# ($::WIDTH - $label->{w}) * 0.5, 339# ($::WIDTH - $label->{w}) * 0.5,
284# ($::HEIGHT - $label->{h}) * 0.5, 340# ($::HEIGHT - $label->{h}) * 0.5,
285# ); 341# );
286# }); 342# });
287# 343#
… …
407 463
408 $self->{entry} = new CFClient::UI::Entry 464 $self->{entry} = new CFClient::UI::Entry
409 on_changed => sub { 465 on_changed => sub {
410 $self->update_labels; 466 $self->update_labels;
411 }, 467 },
468 on_button_down => sub {
469 my ($entry, $ev, $x, $y) = @_;
470
471 if ($ev->{button} == 3) {
472 (new CFClient::UI::Menu
473 items => [
474 ["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->focus_in }) }]
475 ],
476 )->popup ($ev);
477 return 1;
478 }
479 0
480 },
412 on_key_down => sub { 481 on_key_down => sub {
413 my ($entry, $ev) = @_; 482 my ($entry, $ev) = @_;
414 483
415 my $self = $entry->{parent}{parent}; 484 my $self = $entry->{parent}{parent};
416 485
417 if ($ev->{sym} == 13) { 486 if ($ev->{sym} == 13) {
418 if (exists $self->{select}) { 487 if (exists $self->{select}) {
419 $self->{last_command} = $self->{select}; 488 $self->{last_command} = $self->{select};
420 $::CONN->user_send ($self->{select}); 489 $::CONN->user_send ($self->{select});
490
491 unshift @{$self->{history}}, $self->{select};
492 $self->{hist_ptr} = 0;
493
421 $self->hide; 494 $self->hide;
422 } 495 }
423 } elsif ($ev->{sym} == 27) { 496 } elsif ($ev->{sym} == 27) {
497 $self->{hist_ptr} = 0;
424 $self->hide; 498 $self->hide;
425 return; 499 return;
426 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 500 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
501 if ($self->{hist_ptr} > 1) {
502 $self->{hist_ptr}--;
503 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
504 } elsif ($self->{hist_ptr} > 0) {
505 $self->{hist_ptr}--;
506 $self->{entry}->set_text ($self->{hist_saveback});
507 } else {
427 ++$self->{select_offset} 508 ++$self->{select_offset}
428 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 509 if $self->{select_offset} < $#{ $self->{last_match} || [] };
510 }
429 $self->update_labels; 511 $self->update_labels;
430 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 512 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
513 if ($self->{select_offset}) {
431 --$self->{select_offset} 514 --$self->{select_offset}
515 } else {
516 unless ($self->{hist_ptr}) {
517 $self->{hist_saveback} = $self->{entry}->get_text;
518 }
519 if ($self->{hist_ptr} <= $#{$self->{history}}) {
432 if $self->{select_offset}; 520 $self->{hist_ptr}++;
521 }
522 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
523 if exists $self->{history}->[$self->{hist_ptr} - 1];
524 }
433 $self->update_labels; 525 $self->update_labels;
434 } else { 526 } else {
435 return 0; 527 return 0;
436 } 528 }
437 529
… …
456 548
457sub size_allocate { 549sub size_allocate {
458 my ($self, $w, $h) = @_; 550 my ($self, $w, $h) = @_;
459 551
460 $self->SUPER::size_allocate ($w, $h); 552 $self->SUPER::size_allocate ($w, $h);
461 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 553 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
462} 554}
463 555
464sub show { 556sub show {
465 my ($self) = @_; 557 my ($self) = @_;
466 558
… …
476} 568}
477 569
478sub key_down { 570sub key_down {
479 my ($self, $ev) = @_; 571 my ($self, $ev) = @_;
480 572
481 $self->{entry}->key_down ($ev); 573 $self->{entry}->key_down ($ev)
482} 574}
483 575
484sub update_labels { 576sub update_labels {
485 my ($self) = @_; 577 my ($self) = @_;
486 578

Diff Legend

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