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.53 by root, Sun Jun 11 17:30:53 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 $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;
73 my $fy = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}) - 0.5 * $sh + 0.99;
74
75 $::CONN->send (sprintf "lookat %d %d", $fx, $fy)
76 if $::CONN;
77
78 } elsif ($ev->{button} == 2) {
62 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 79 my ($ox, $oy) = ($ev->{x}, $ev->{y});
63 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 80 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
64 81
65 $self->{motion} = sub { 82 $self->{motion} = sub {
66 my ($ev, $x, $y) = @_; 83 my ($ev, $x, $y) = @_;
… …
71 $::CFG->{map_shift_y} = $bh + $y - $oy; 88 $::CFG->{map_shift_y} = $bh + $y - $oy;
72 89
73 $self->update; 90 $self->update;
74 }; 91 };
75 } 92 }
93
94 1
76} 95}
77 96
78sub button_up { 97sub button_up {
79 my ($self, $ev, $x, $y) = @_; 98 my ($self, $ev, $x, $y) = @_;
80 99
81 delete $self->{motion}; 100 delete $self->{motion};
101
102 1
82} 103}
83 104
84sub mouse_motion { 105sub mouse_motion {
85 my ($self, $ev, $x, $y) = @_; 106 my ($self, $ev, $x, $y) = @_;
86 107
108 if ($self->{motion}) {
87 $self->{motion}->($ev, $x, $y) if $self->{motion}; 109 $self->{motion}->($ev, $x, $y);
110 } else {
111 return 0;
112 }
113
114 1
88} 115}
89 116
90sub size_request { 117sub size_request {
91 ( 118 (
92 1 + 32 * int $::WIDTH / 32, 119 1 + 32 * int $::WIDTH / 32,
… …
118); 145);
119 146
120sub key_down { 147sub key_down {
121 my ($self, $ev) = @_; 148 my ($self, $ev) = @_;
122 149
123 return unless $::CONN; 150 return 0 unless $::CONN;
124 151
125 my $mod = $ev->{mod}; 152 my $mod = $ev->{mod};
126 my $sym = $ev->{sym}; 153 my $sym = $ev->{sym};
127 my $uni = $ev->{unicode}; 154 my $uni = $ev->{unicode};
128 155
… …
156 $::CONN->user_send ("run $DIR{$sym}[0]"); 183 $::CONN->user_send ("run $DIR{$sym}[0]");
157 } else { 184 } else {
158 $::CONN->user_send ("$DIR{$sym}[1]"); 185 $::CONN->user_send ("$DIR{$sym}[1]");
159 } 186 }
160 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { 187 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
161 CFClient::Recorder::start (1); 188 $::BIND_EDITOR->set_binding (undef, undef, [],
189 sub {
190 my ($mod, $sym, $cmds) = @_;
191 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
192 });
193 $::BIND_EDITOR->start;
194 $::BIND_EDITOR->show;
162 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { 195 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
163 CFClient::Recorder::stop (1); 196 $::BIND_EDITOR->stop;
197 $::BIND_EDITOR->ask_for_bind_and_commit;
198 $::BIND_EDITOR->hide;
164 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) { 199 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
165 $::CONN->user_send ($_) for @$bind_cmd; 200 $::CONN->user_send ($_) for @$bind_cmd;
166 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 201 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
167 $self->{completer}->key_down ($ev); 202 $self->{completer}->key_down ($ev);
168 $self->{completer}->show; 203 $self->{completer}->show;
204 } else {
205 return 0;
206 }
207
169 } 208 1
170} 209}
171 210
172sub key_up { 211sub key_up {
173 my ($self, $ev) = @_; 212 my ($self, $ev) = @_;
174 213
214 my $res = 0;
175 my $mod = $ev->{mod}; 215 my $mod = $ev->{mod};
176 my $sym = $ev->{sym}; 216 my $sym = $ev->{sym};
177 217
178 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 218 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
179 $::CONN->user_send ("fire_stop"); 219 $::CONN->user_send ("fire_stop");
220 $res = 1;
180 } 221 }
222
181 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 223 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
182 $::CONN->user_send ("run_stop"); 224 $::CONN->user_send ("run_stop");
225 $res = 1;
183 } 226 }
227
228 $res
184} 229}
185 230
186sub draw { 231sub draw {
187 my ($self) = @_; 232 my ($self) = @_;
188 233
… …
215 glConvolutionFilter2D ( 260 glConvolutionFilter2D (
216 GL_CONVOLUTION_2D, 261 GL_CONVOLUTION_2D,
217 GL_ALPHA, 262 GL_ALPHA,
218 3, 3, 263 3, 3,
219 GL_ALPHA, GL_FLOAT, 264 GL_ALPHA, GL_FLOAT,
220 pack "f*", 265 (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 ); 266 );
225 glEnable GL_CONVOLUTION_2D; 267 glEnable GL_CONVOLUTION_2D;
226 } 268 }
227 269
228 $self->{fow_texture_name} ||= glGenTexture; 270 $self->{fow_texture_name} ||= glGenTexture;
… …
283# 325#
284# $label->show; 326# $label->show;
285# $label->update; 327# $label->update;
286# 328#
287# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub { 329# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
288# $label->move ( 330# $label->move_abs (
289# ($::WIDTH - $label->{w}) * 0.5, 331# ($::WIDTH - $label->{w}) * 0.5,
290# ($::HEIGHT - $label->{h}) * 0.5, 332# ($::HEIGHT - $label->{h}) * 0.5,
291# ); 333# );
292# }); 334# });
293# 335#
… …
422 464
423 if ($ev->{sym} == 13) { 465 if ($ev->{sym} == 13) {
424 if (exists $self->{select}) { 466 if (exists $self->{select}) {
425 $self->{last_command} = $self->{select}; 467 $self->{last_command} = $self->{select};
426 $::CONN->user_send ($self->{select}); 468 $::CONN->user_send ($self->{select});
469
470 unshift @{$self->{history}}, $self->{select};
471 $self->{hist_ptr} = 0;
472
427 $self->hide; 473 $self->hide;
428 } 474 }
429 } elsif ($ev->{sym} == 27) { 475 } elsif ($ev->{sym} == 27) {
476 $self->{hist_ptr} = 0;
430 $self->hide; 477 $self->hide;
431 return; 478 return;
432 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 479 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
480 if ($self->{hist_ptr} > 1) {
481 $self->{hist_ptr}--;
482 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
483 } elsif ($self->{hist_ptr} > 0) {
484 $self->{hist_ptr}--;
485 $self->{entry}->set_text ($self->{hist_saveback});
486 } else {
433 ++$self->{select_offset} 487 ++$self->{select_offset}
434 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 488 if $self->{select_offset} < $#{ $self->{last_match} || [] };
489 }
435 $self->update_labels; 490 $self->update_labels;
436 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 491 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
492 if ($self->{select_offset}) {
437 --$self->{select_offset} 493 --$self->{select_offset}
494 } else {
495 unless ($self->{hist_ptr}) {
496 $self->{hist_saveback} = $self->{entry}->get_text;
497 }
498 if ($self->{hist_ptr} <= $#{$self->{history}}) {
438 if $self->{select_offset}; 499 $self->{hist_ptr}++;
500 }
501 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
502 if exists $self->{history}->[$self->{hist_ptr} - 1];
503 }
439 $self->update_labels; 504 $self->update_labels;
440 } else { 505 } else {
441 return 0; 506 return 0;
442 } 507 }
443 508
… …
462 527
463sub size_allocate { 528sub size_allocate {
464 my ($self, $w, $h) = @_; 529 my ($self, $w, $h) = @_;
465 530
466 $self->SUPER::size_allocate ($w, $h); 531 $self->SUPER::size_allocate ($w, $h);
467 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 532 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
468} 533}
469 534
470sub show { 535sub show {
471 my ($self) = @_; 536 my ($self) = @_;
472 537
… …
482} 547}
483 548
484sub key_down { 549sub key_down {
485 my ($self, $ev) = @_; 550 my ($self, $ev) = @_;
486 551
487 $self->{entry}->key_down ($ev); 552 $self->{entry}->key_down ($ev)
488} 553}
489 554
490sub update_labels { 555sub update_labels {
491 my ($self) = @_; 556 my ($self) = @_;
492 557

Diff Legend

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