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.53 by root, Sun Jun 11 17:30:53 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 $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 75 my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
70 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 76 my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
71 77
72 my $fx = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}) - 0.5 * $sw + 0.99; 78 $x -= int 0.5 * $self->{sw};
73 my $fy = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}) - 0.5 * $sh + 0.99; 79 $y -= int 0.5 * $self->{sh};
74 80
75 $::CONN->send (sprintf "lookat %d %d", $fx, $fy) 81 $::CONN->lookat ($x, $y)
76 if $::CONN; 82 if $::CONN;
77 83
78 } elsif ($ev->{button} == 2) { 84 } elsif ($ev->{button} == 2) {
79 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 85 my ($ox, $oy) = ($ev->{x}, $ev->{y});
80 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 86 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
… …
92 } 98 }
93 99
94 1 100 1
95} 101}
96 102
97sub button_up { 103sub invoke_button_up {
98 my ($self, $ev, $x, $y) = @_; 104 my ($self, $ev, $x, $y) = @_;
99 105
100 delete $self->{motion}; 106 delete $self->{motion};
101 107
102 1 108 1
103} 109}
104 110
105sub mouse_motion { 111sub invoke_mouse_motion {
106 my ($self, $ev, $x, $y) = @_; 112 my ($self, $ev, $x, $y) = @_;
107 113
108 if ($self->{motion}) { 114 if ($self->{motion}) {
109 $self->{motion}->($ev, $x, $y); 115 $self->{motion}->($ev, $x, $y);
110 } else { 116 } else {
… …
114 1 120 1
115} 121}
116 122
117sub size_request { 123sub size_request {
118 ( 124 (
119 1 + 32 * int $::WIDTH / 32, 125 32 * CFClient::ceil $::WIDTH / 32,
120 1 + 32 * int $::HEIGHT / 32, 126 32 * CFClient::ceil $::HEIGHT / 32,
121 ) 127 )
122} 128}
123 129
124sub update { 130sub update {
125 my ($self) = @_; 131 my ($self) = @_;
… …
142 CFClient::SDLK_RIGHT, [3, "east"], 148 CFClient::SDLK_RIGHT, [3, "east"],
143 CFClient::SDLK_DOWN, [5, "south"], 149 CFClient::SDLK_DOWN, [5, "south"],
144 CFClient::SDLK_LEFT, [7, "west"], 150 CFClient::SDLK_LEFT, [7, "west"],
145); 151);
146 152
147sub key_down { 153sub invoke_key_down {
148 my ($self, $ev) = @_; 154 my ($self, $ev) = @_;
149 155
150 return 0 unless $::CONN; 156 return 0 unless $::CONN;
151 157
152 my $mod = $ev->{mod}; 158 my $mod = $ev->{mod};
… …
175 $self->{completer}->set_prefix (""); 181 $self->{completer}->set_prefix ("");
176 $self->{completer}->show; 182 $self->{completer}->show;
177 } elsif (exists $DIR{$sym}) { 183 } elsif (exists $DIR{$sym}) {
178 if ($mod & CFClient::KMOD_SHIFT) { 184 if ($mod & CFClient::KMOD_SHIFT) {
179 $self->{shft}++; 185 $self->{shft}++;
186 if ($DIR{$sym}[0] != $self->{fire_dir}) {
180 $::CONN->user_send ("fire $DIR{$sym}[0]"); 187 $::CONN->user_send ("fire $DIR{$sym}[0]");
188 }
189 $self->{fire_dir} = $DIR{$sym}[0];
181 } elsif ($mod & CFClient::KMOD_CTRL) { 190 } elsif ($mod & CFClient::KMOD_CTRL) {
182 $self->{ctrl}++; 191 $self->{ctrl}++;
183 $::CONN->user_send ("run $DIR{$sym}[0]"); 192 $::CONN->user_send ("run $DIR{$sym}[0]");
184 } else { 193 } else {
185 $::CONN->user_send ("$DIR{$sym}[1]"); 194 $::CONN->user_send ("$DIR{$sym}[1]");
186 } 195 }
187 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { 196 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
188 $::BIND_EDITOR->set_binding (undef, undef, [], 197 $::BIND_EDITOR->set_binding (undef, undef, [],
189 sub { 198 sub {
190 my ($mod, $sym, $cmds) = @_; 199 my ($mod, $sym, $cmds) = @_;
191 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 200 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
192 }); 201 });
193 $::BIND_EDITOR->start; 202 $::BIND_EDITOR->start;
194 $::BIND_EDITOR->show; 203 $::BIND_EDITOR->show;
195 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { 204 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
196 $::BIND_EDITOR->stop; 205 $::BIND_EDITOR->stop;
197 $::BIND_EDITOR->ask_for_bind_and_commit; 206 $::BIND_EDITOR->ask_for_bind_and_commit;
198 $::BIND_EDITOR->hide; 207 $::BIND_EDITOR->hide;
199 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) { 208 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
200 $::CONN->user_send ($_) for @$bind_cmd; 209 $::CONN->user_send ($_) for @$bind_cmd;
201 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 210 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
202 $self->{completer}->key_down ($ev); 211 $self->{completer}->invoke_key_down ($ev);
203 $self->{completer}->show; 212 $self->{completer}->show;
204 } else { 213 } else {
205 return 0; 214 return 0;
206 } 215 }
207 216
208 1 217 1
209} 218}
210 219
211sub key_up { 220sub invoke_key_up {
212 my ($self, $ev) = @_; 221 my ($self, $ev) = @_;
213 222
214 my $res = 0; 223 my $res = 0;
215 my $mod = $ev->{mod}; 224 my $mod = $ev->{mod};
216 my $sym = $ev->{sym}; 225 my $sym = $ev->{sym};
217 226
227 if ($::CFG->{shift_fire_stop}) {
218 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 228 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
219 $::CONN->user_send ("fire_stop"); 229 $::CONN->user_send ("fire_stop");
230 delete $self->{fire_dir};
220 $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 }
221 } 243 }
222 244
223 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 245 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
224 $::CONN->user_send ("run_stop"); 246 $::CONN->user_send ("run_stop");
225 $res = 1; 247 $res = 1;
226 } 248 }
227 249
228 $res 250 $res
229} 251}
230 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
231sub draw { 264sub draw {
232 my ($self) = @_; 265 my ($self) = @_;
266
267 return unless $::MAP;
233 268
234 my $focused = $CFClient::UI::FOCUS == $self 269 my $focused = $CFClient::UI::FOCUS == $self
235 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 270 || $CFClient::UI::FOCUS == $self->{completer}{entry};
236 271
237 return 272 return
238 unless $focused || !$::FAST; 273 unless $focused || !$::FAST;
239 274
240 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
241 glNewList $self->{list}; 314 glNewList $self->{list};
242 315
243 if ($::MAP) {
244 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
245 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
246
247 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
248 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
249
250 glPushMatrix; 316 glPushMatrix;
317 glTranslate $sx0, $sy0;
251 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 318 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
252 319
253 glTranslate $sx0 - 32, $sy0 - 32, 0; 320 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
254 321
255 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 322 glScale 32, 32;
256 323
257 if ($::CFG->{fow_enable}) { 324 if (my $tex = $self->{fow_texture}) {
258 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
259 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
260 glConvolutionFilter2D (
261 GL_CONVOLUTION_2D,
262 GL_ALPHA,
263 3, 3,
264 GL_ALPHA, GL_FLOAT,
265 (pack "f*", @{ $self->{smooth_matrix} }),
266 );
267 glEnable GL_CONVOLUTION_2D;
268 }
269
270 $self->{fow_texture_name} ||= glGenTexture;
271 # try to re-use the texture name: TODO improve texture class instead
272
273 $self->{fow_texture} = new CFClient::Texture
274 w => $w,
275 h => $h,
276 data => $data,
277 name => $self->{fow_texture_name},
278 internalformat => GL_ALPHA,
279 format => GL_ALPHA;
280
281 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
282
283 glEnable GL_TEXTURE_2D; 325 glEnable GL_TEXTURE_2D;
284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 326 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
285 327
286 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 328 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
287 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 329 $self->{fow_texture}->draw_quad_alpha (0, 0);
288 330
289 glDisable GL_TEXTURE_2D; 331 glDisable GL_TEXTURE_2D;
290 } 332 }
291 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
292 glPopMatrix; 345 glPopMatrix;
293 }
294
295 glEndList; 346 glEndList;
296 } 347 }
297 348
298 glPushMatrix;
299 glCallList $self->{list}; 349 glCallList $self->{list};
300 glPopMatrix;
301 350
302 # TNT2 emulates logops in software (or worse :) 351 # TNT2 emulates logops in software (or worse :)
303 if ($focused) { 352 unless ($focused) {
304 (delete $self->{out_of_focus})->destroy
305 if $self->{out_of_focus};
306 } else {
307 glColor 0.4, 0.2, 0.2, 0.6; 353 glColor 0.4, 0.2, 0.2, 0.6;
308 glEnable GL_BLEND; 354 glEnable GL_BLEND;
309 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 355 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
310 glBegin GL_QUADS; 356 glBegin GL_QUADS;
311 glVertex 0, 0; 357 glVertex 0, 0;
312 glVertex 0, $::HEIGHT; 358 glVertex 0, $::HEIGHT;
313 glVertex $::WIDTH, $::HEIGHT; 359 glVertex $::WIDTH, $::HEIGHT;
314 glVertex $::WIDTH, 0; 360 glVertex $::WIDTH, 0;
315 glEnd; 361 glEnd;
316 glDisable GL_BLEND; 362 glDisable GL_BLEND;
317
318# $self->{out_of_focus} ||= do {
319# my $label = new CFClient::UI::Label
320# x => 0,
321# y => 0,
322# z => 1,
323# ellipsise => 0,
324# text => "map out of focus (click map to play)";
325#
326# $label->show;
327# $label->update;
328#
329# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
330# $label->move_abs (
331# ($::WIDTH - $label->{w}) * 0.5,
332# ($::HEIGHT - $label->{h}) * 0.5,
333# );
334# });
335#
336# $label
337# };
338 } 363 }
339} 364}
340 365
341sub DESTROY { 366sub DESTROY {
342 my $self = shift; 367 my $self = shift;
… …
355 380
356sub size_request { 381sub size_request {
357 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 382 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
358} 383}
359 384
360sub size_allocate { 385sub invoke_size_allocate {
361 my ($self, $w, $h) = @_; 386 my ($self, $w, $h) = @_;
362 387
363 $self->SUPER::size_allocate ($w, $h);
364 $self->update; 388 $self->update;
389
390 1
365} 391}
366 392
367sub update { 393sub update {
368 my ($self) = @_; 394 my ($self) = @_;
369 395
… …
454 ]; 480 ];
455 481
456 $self->{entry} = new CFClient::UI::Entry 482 $self->{entry} = new CFClient::UI::Entry
457 on_changed => sub { 483 on_changed => sub {
458 $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
459 }, 499 },
460 on_key_down => sub { 500 on_key_down => sub {
461 my ($entry, $ev) = @_; 501 my ($entry, $ev) = @_;
462 502
463 my $self = $entry->{parent}{parent}; 503 my $self = $entry->{parent}{parent};
… …
473 $self->hide; 513 $self->hide;
474 } 514 }
475 } elsif ($ev->{sym} == 27) { 515 } elsif ($ev->{sym} == 27) {
476 $self->{hist_ptr} = 0; 516 $self->{hist_ptr} = 0;
477 $self->hide; 517 $self->hide;
478 return;
479 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 518 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
480 if ($self->{hist_ptr} > 1) { 519 if ($self->{hist_ptr} > 1) {
481 $self->{hist_ptr}--; 520 $self->{hist_ptr}--;
482 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 521 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
483 } elsif ($self->{hist_ptr} > 0) { 522 } elsif ($self->{hist_ptr} > 0) {
… …
523 562
524 $self->{entry}->set_text ($prefix); 563 $self->{entry}->set_text ($prefix);
525 $self->show; 564 $self->show;
526} 565}
527 566
528sub size_allocate { 567sub invoke_size_allocate {
529 my ($self, $w, $h) = @_; 568 my ($self, $w, $h) = @_;
530 569
531 $self->SUPER::size_allocate ($w, $h);
532 $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)
533} 573}
534 574
535sub show { 575sub show {
536 my ($self) = @_; 576 my ($self) = @_;
537 577
538 $self->SUPER::show; 578 $self->SUPER::show;
539 $self->{entry}->focus_in; 579 $self->{entry}->grab_focus;
540} 580}
541 581
542sub hide { 582sub hide {
543 my ($self) = @_; 583 my ($self) = @_;
544 584
545 $self->SUPER::hide; 585 $self->SUPER::hide;
546 $self->{entry}->set_text (""); 586 $self->{entry}->set_text ("");
547} 587}
548 588
549sub key_down { 589sub invoke_key_down {
550 my ($self, $ev) = @_; 590 my ($self, $ev) = @_;
551 591
552 $self->{entry}->key_down ($ev) 592 $self->{entry}->emit (key_down => $ev)
553} 593}
554 594
555sub update_labels { 595sub update_labels {
556 my ($self) = @_; 596 my ($self) = @_;
557 597
… …
644 $label->set_text (""); 684 $label->set_text ("");
645 $label->set_tooltip (""); 685 $label->set_tooltip ("");
646 } 686 }
647 687
648 $self->update; 688 $self->update;
649 ###
650} 689}
651 690
652sub _draw { 691sub _draw {
653 my ($self) = @_; 692 my ($self) = @_;
654 693

Diff Legend

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