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.54 by root, Sun Jun 11 20:05:55 2006 UTC vs.
Revision 1.66 by root, Sun Jun 18 19:13:20 2006 UTC

… …
6use List::Util qw(min max); 6use List::Util qw(min max);
7 7
8use CFClient::OpenGL; 8use CFClient::OpenGL;
9 9
10our @ISA = CFClient::UI::Base::; 10our @ISA = CFClient::UI::Base::;
11
12my $magicmap_tex =
13 new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png",
14 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
11 15
12sub new { 16sub new {
13 my $class = shift; 17 my $class = shift;
14 18
15 my $self = $class->SUPER::new ( 19 my $self = $class->SUPER::new (
… …
34 . "To enter a verbatim command to send to the server, just type the command, " 38 . "To enter a verbatim command to send to the server, just type the command, "
35 . "followed by a space, and press return. " 39 . "followed by a space, and press return. "
36 . "Typing the initial letters of words (or just any letters) displays guesses " 40 . "Typing the initial letters of words (or just any letters) displays guesses "
37 . "for commands you might want to use.\n" 41 . "for commands you might want to use.\n"
38 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n" 42 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
39 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.", 43 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
40 ; 44 ;
41 45
42 $self 46 $self
43} 47}
44 48
… …
58 my ($self) = @_; 62 my ($self) = @_;
59 63
60 %{$self->{completer}{command}} = (); 64 %{$self->{completer}{command}} = ();
61} 65}
62 66
63sub button_down { 67sub invoke_button_down {
64 my ($self, $ev, $x, $y) = @_; 68 my ($self, $ev, $x, $y) = @_;
65 69
70 return unless $::CONN;
71
66 $self->focus_in; 72 $self->grab_focus;
67 73
68 if ($ev->{button} == 1) { 74 if ($ev->{button} == 1) {
69 my $x = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}); 75 my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
70 my $y = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}); 76 my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
71
72 $x += int 0.5 * ($::MAP->w - $self->{sw} - 1);
73 $y += int 0.5 * ($::MAP->h - $self->{sh} - 1);
74 77
75 $x -= int 0.5 * $::MAP->w; 78 $x -= int 0.5 * $self->{sw};
76 $y -= int 0.5 * $::MAP->h; 79 $y -= int 0.5 * $self->{sh};
77 80
78 $x += 1; 81 $::CONN->lookat ($x, $y)
79 $y += 1;
80
81 $::CONN->send (sprintf "lookat %d %d", $x, $y)
82 if $::CONN; 82 if $::CONN;
83 83
84 } elsif ($ev->{button} == 2) { 84 } elsif ($ev->{button} == 2) {
85 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 85 my ($ox, $oy) = ($ev->{x}, $ev->{y});
86 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 86 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
… …
98 } 98 }
99 99
100 1 100 1
101} 101}
102 102
103sub button_up { 103sub invoke_button_up {
104 my ($self, $ev, $x, $y) = @_; 104 my ($self, $ev, $x, $y) = @_;
105 105
106 delete $self->{motion}; 106 delete $self->{motion};
107 107
108 1 108 1
109} 109}
110 110
111sub mouse_motion { 111sub invoke_mouse_motion {
112 my ($self, $ev, $x, $y) = @_; 112 my ($self, $ev, $x, $y) = @_;
113 113
114 if ($self->{motion}) { 114 if ($self->{motion}) {
115 $self->{motion}->($ev, $x, $y); 115 $self->{motion}->($ev, $x, $y);
116 } else { 116 } else {
… …
120 1 120 1
121} 121}
122 122
123sub size_request { 123sub size_request {
124 ( 124 (
125 1 + 32 * int $::WIDTH / 32, 125 32 * CFClient::ceil $::WIDTH / 32,
126 1 + 32 * int $::HEIGHT / 32, 126 32 * CFClient::ceil $::HEIGHT / 32,
127 ) 127 )
128} 128}
129 129
130sub update { 130sub update {
131 my ($self) = @_; 131 my ($self) = @_;
… …
148 CFClient::SDLK_RIGHT, [3, "east"], 148 CFClient::SDLK_RIGHT, [3, "east"],
149 CFClient::SDLK_DOWN, [5, "south"], 149 CFClient::SDLK_DOWN, [5, "south"],
150 CFClient::SDLK_LEFT, [7, "west"], 150 CFClient::SDLK_LEFT, [7, "west"],
151); 151);
152 152
153sub key_down { 153sub invoke_key_down {
154 my ($self, $ev) = @_; 154 my ($self, $ev) = @_;
155 155
156 return 0 unless $::CONN; 156 return 0 unless $::CONN;
157 157
158 my $mod = $ev->{mod}; 158 my $mod = $ev->{mod};
… …
181 $self->{completer}->set_prefix (""); 181 $self->{completer}->set_prefix ("");
182 $self->{completer}->show; 182 $self->{completer}->show;
183 } elsif (exists $DIR{$sym}) { 183 } elsif (exists $DIR{$sym}) {
184 if ($mod & CFClient::KMOD_SHIFT) { 184 if ($mod & CFClient::KMOD_SHIFT) {
185 $self->{shft}++; 185 $self->{shft}++;
186 if ($DIR{$sym}[0] != $self->{fire_dir}) {
186 $::CONN->user_send ("fire $DIR{$sym}[0]"); 187 $::CONN->user_send ("fire $DIR{$sym}[0]");
188 }
189 $self->{fire_dir} = $DIR{$sym}[0];
187 } elsif ($mod & CFClient::KMOD_CTRL) { 190 } elsif ($mod & CFClient::KMOD_CTRL) {
188 $self->{ctrl}++; 191 $self->{ctrl}++;
189 $::CONN->user_send ("run $DIR{$sym}[0]"); 192 $::CONN->user_send ("run $DIR{$sym}[0]");
190 } else { 193 } else {
191 $::CONN->user_send ("$DIR{$sym}[1]"); 194 $::CONN->user_send ("$DIR{$sym}[1]");
192 } 195 }
193 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { 196 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
194 $::BIND_EDITOR->set_binding (undef, undef, [], 197 $::BIND_EDITOR->set_binding (undef, undef, [],
195 sub { 198 sub {
196 my ($mod, $sym, $cmds) = @_; 199 my ($mod, $sym, $cmds) = @_;
197 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 200 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
198 }); 201 });
199 $::BIND_EDITOR->start; 202 $::BIND_EDITOR->start;
200 $::BIND_EDITOR->show; 203 $::BIND_EDITOR->show;
201 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { 204 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
202 $::BIND_EDITOR->stop; 205 $::BIND_EDITOR->stop;
203 $::BIND_EDITOR->ask_for_bind_and_commit; 206 $::BIND_EDITOR->ask_for_bind_and_commit;
204 $::BIND_EDITOR->hide; 207 $::BIND_EDITOR->hide;
205 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) { 208 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
206 $::CONN->user_send ($_) for @$bind_cmd; 209 $::CONN->user_send ($_) for @$bind_cmd;
207 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 210 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
208 $self->{completer}->key_down ($ev); 211 $self->{completer}->invoke_key_down ($ev);
209 $self->{completer}->show; 212 $self->{completer}->show;
210 } else { 213 } else {
211 return 0; 214 return 0;
212 } 215 }
213 216
214 1 217 1
215} 218}
216 219
217sub key_up { 220sub invoke_key_up {
218 my ($self, $ev) = @_; 221 my ($self, $ev) = @_;
219 222
220 my $res = 0; 223 my $res = 0;
221 my $mod = $ev->{mod}; 224 my $mod = $ev->{mod};
222 my $sym = $ev->{sym}; 225 my $sym = $ev->{sym};
223 226
227 if ($::CFG->{shift_fire_stop}) {
224 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 228 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
225 $::CONN->user_send ("fire_stop"); 229 $::CONN->user_send ("fire_stop");
230 delete $self->{fire_dir};
226 $res = 1; 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 }
227 } 243 }
228 244
229 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 245 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
230 $::CONN->user_send ("run_stop"); 246 $::CONN->user_send ("run_stop");
231 $res = 1; 247 $res = 1;
232 } 248 }
233 249
234 $res 250 $res
235} 251}
236 252
253sub set_magicmap {
254 my ($self, $w, $h, $x, $y, $data) = @_;
255
256 $x -= $::MAP->ox + int 0.5 * $::MAP->w;
257 $y -= $::MAP->oy + int 0.5 * $::MAP->h;
258
259 $self->{magicmap} = [$x, $y, $w, $h, $data];
260
261 $self->update;
262}
263
237sub draw { 264sub draw {
238 my ($self) = @_; 265 my ($self) = @_;
266
267 return unless $::MAP;
239 268
240 my $focused = $CFClient::UI::FOCUS == $self 269 my $focused = $CFClient::UI::FOCUS == $self
241 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 270 || $CFClient::UI::FOCUS == $self->{completer}{entry};
242 271
243 return 272 return
244 unless $focused || !$::FAST; 273 unless $focused || !$::FAST;
245 274
246 if (delete $self->{need_update}) { 275 if (delete $self->{need_update}) {
276 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
277
278 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize;
279 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize;
280
281 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
282 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
283
284 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize;
285 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize;
286
287 if ($::CFG->{fow_enable}) {
288 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
289
290 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
291 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
292 glConvolutionFilter2D (
293 GL_CONVOLUTION_2D,
294 GL_ALPHA,
295 3, 3,
296 GL_ALPHA, GL_FLOAT,
297 (pack "f*", @{ $self->{smooth_matrix} }),
298 );
299 glEnable GL_CONVOLUTION_2D;
300 }
301
302 $self->{fow_texture} = new CFClient::Texture
303 w => $w,
304 h => $h,
305 data => $data,
306 internalformat => GL_ALPHA,
307 format => GL_ALPHA;
308
309 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
310 } else {
311 delete $self->{fow_texture};
312 }
313
247 glNewList $self->{list}; 314 glNewList $self->{list};
248 315
249 if ($::MAP) {
250 my $sw = $self->{sw} = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
251 my $sh = $self->{sh} = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
252
253 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale};
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;
257
258 glPushMatrix; 316 glPushMatrix;
317 glTranslate $sx0, $sy0;
259 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 318 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
260 319
261 glTranslate $sx0, $sy0; 320 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
262 321
263 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 322 glScale 32, 32;
264 323
265 if ($::CFG->{fow_enable}) { 324 if (my $tex = $self->{fow_texture}) {
266 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
267 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
268 glConvolutionFilter2D (
269 GL_CONVOLUTION_2D,
270 GL_ALPHA,
271 3, 3,
272 GL_ALPHA, GL_FLOAT,
273 (pack "f*", @{ $self->{smooth_matrix} }),
274 );
275 glEnable GL_CONVOLUTION_2D;
276 }
277
278 $self->{fow_texture_name} ||= glGenTexture;
279 # try to re-use the texture name: TODO improve texture class instead
280
281 $self->{fow_texture} = new CFClient::Texture
282 w => $w,
283 h => $h,
284 data => $data,
285 name => $self->{fow_texture_name},
286 internalformat => GL_ALPHA,
287 format => GL_ALPHA;
288
289 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
290
291 glEnable GL_TEXTURE_2D; 325 glEnable GL_TEXTURE_2D;
292 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 326 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
293 327
294 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 328 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
295 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 329 $self->{fow_texture}->draw_quad_alpha (0, 0);
296 330
297 glDisable GL_TEXTURE_2D; 331 glDisable GL_TEXTURE_2D;
298 } 332 }
299 333
334 if ($self->{magicmap}) {
335 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
336
337 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
338 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
339
340 glTranslate - $x - 1, - $y - 1;
341 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
342 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
343 }
344
300 glPopMatrix; 345 glPopMatrix;
301 }
302
303 glEndList; 346 glEndList;
304 } 347 }
305 348
306 glPushMatrix;
307 glCallList $self->{list}; 349 glCallList $self->{list};
308 glPopMatrix;
309 350
310 # TNT2 emulates logops in software (or worse :) 351 # TNT2 emulates logops in software (or worse :)
311 if ($focused) { 352 unless ($focused) {
312 (delete $self->{out_of_focus})->destroy
313 if $self->{out_of_focus};
314 } else {
315 glColor 0.4, 0.2, 0.2, 0.6; 353 glColor 0.4, 0.2, 0.2, 0.6;
316 glEnable GL_BLEND; 354 glEnable GL_BLEND;
317 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 355 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
318 glBegin GL_QUADS; 356 glBegin GL_QUADS;
319 glVertex 0, 0; 357 glVertex 0, 0;
320 glVertex 0, $::HEIGHT; 358 glVertex 0, $::HEIGHT;
321 glVertex $::WIDTH, $::HEIGHT; 359 glVertex $::WIDTH, $::HEIGHT;
322 glVertex $::WIDTH, 0; 360 glVertex $::WIDTH, 0;
323 glEnd; 361 glEnd;
324 glDisable GL_BLEND; 362 glDisable GL_BLEND;
325
326# $self->{out_of_focus} ||= do {
327# my $label = new CFClient::UI::Label
328# x => 0,
329# y => 0,
330# z => 1,
331# ellipsise => 0,
332# text => "map out of focus (click map to play)";
333#
334# $label->show;
335# $label->update;
336#
337# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
338# $label->move_abs (
339# ($::WIDTH - $label->{w}) * 0.5,
340# ($::HEIGHT - $label->{h}) * 0.5,
341# );
342# });
343#
344# $label
345# };
346 } 363 }
347} 364}
348 365
349sub DESTROY { 366sub DESTROY {
350 my $self = shift; 367 my $self = shift;
… …
363 380
364sub size_request { 381sub size_request {
365 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 382 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
366} 383}
367 384
368sub size_allocate { 385sub invoke_size_allocate {
369 my ($self, $w, $h) = @_; 386 my ($self, $w, $h) = @_;
370 387
371 $self->SUPER::size_allocate ($w, $h);
372 $self->update; 388 $self->update;
389
390 1
373} 391}
374 392
375sub update { 393sub update {
376 my ($self) = @_; 394 my ($self) = @_;
377 395
… …
462 ]; 480 ];
463 481
464 $self->{entry} = new CFClient::UI::Entry 482 $self->{entry} = new CFClient::UI::Entry
465 on_changed => sub { 483 on_changed => sub {
466 $self->update_labels; 484 $self->update_labels;
485 0
486 },
487 on_button_down => sub {
488 my ($entry, $ev, $x, $y) = @_;
489
490 if ($ev->{button} == 3) {
491 (new CFClient::UI::Menu
492 items => [
493 ["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
494 ],
495 )->popup ($ev);
496 return 1;
497 }
498 0
467 }, 499 },
468 on_key_down => sub { 500 on_key_down => sub {
469 my ($entry, $ev) = @_; 501 my ($entry, $ev) = @_;
470 502
471 my $self = $entry->{parent}{parent}; 503 my $self = $entry->{parent}{parent};
… …
481 $self->hide; 513 $self->hide;
482 } 514 }
483 } elsif ($ev->{sym} == 27) { 515 } elsif ($ev->{sym} == 27) {
484 $self->{hist_ptr} = 0; 516 $self->{hist_ptr} = 0;
485 $self->hide; 517 $self->hide;
486 return;
487 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 518 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
488 if ($self->{hist_ptr} > 1) { 519 if ($self->{hist_ptr} > 1) {
489 $self->{hist_ptr}--; 520 $self->{hist_ptr}--;
490 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 521 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
491 } elsif ($self->{hist_ptr} > 0) { 522 } elsif ($self->{hist_ptr} > 0) {
… …
531 562
532 $self->{entry}->set_text ($prefix); 563 $self->{entry}->set_text ($prefix);
533 $self->show; 564 $self->show;
534} 565}
535 566
536sub size_allocate { 567sub invoke_size_allocate {
537 my ($self, $w, $h) = @_; 568 my ($self, $w, $h) = @_;
538 569
539 $self->SUPER::size_allocate ($w, $h);
540 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 570 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
571
572 $self->SUPER::invoke_size_allocate ($w, $h)
541} 573}
542 574
543sub show { 575sub show {
544 my ($self) = @_; 576 my ($self) = @_;
545 577
546 $self->SUPER::show; 578 $self->SUPER::show;
547 $self->{entry}->focus_in; 579 $self->{entry}->grab_focus;
548} 580}
549 581
550sub hide { 582sub hide {
551 my ($self) = @_; 583 my ($self) = @_;
552 584
553 $self->SUPER::hide; 585 $self->SUPER::hide;
554 $self->{entry}->set_text (""); 586 $self->{entry}->set_text ("");
555} 587}
556 588
557sub key_down { 589sub invoke_key_down {
558 my ($self, $ev) = @_; 590 my ($self, $ev) = @_;
559 591
560 $self->{entry}->key_down ($ev) 592 $self->{entry}->emit (key_down => $ev)
561} 593}
562 594
563sub update_labels { 595sub update_labels {
564 my ($self) = @_; 596 my ($self) = @_;
565 597
… …
652 $label->set_text (""); 684 $label->set_text ("");
653 $label->set_tooltip (""); 685 $label->set_tooltip ("");
654 } 686 }
655 687
656 $self->update; 688 $self->update;
657 ###
658} 689}
659 690
660sub _draw { 691sub _draw {
661 my ($self) = @_; 692 my ($self) = @_;
662 693

Diff Legend

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