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.60 by root, Thu Jun 15 08:29:18 2006 UTC vs.
Revision 1.73 by root, Wed Jul 5 02:15:47 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
66 return unless $::CONN;
67
68 $self->focus_in;
69
70 if ($ev->{button} == 1) { 70 if ($ev->{button} == 1) {
71 $self->grab_focus;
72 return unless $::CONN;
73
71 my $x = CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 74 my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
72 my $y = CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; 75 my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
73 76
74 $x -= int 0.5 * $self->{sw}; 77 $x -= int 0.5 * $self->{sw};
75 $y -= int 0.5 * $self->{sh}; 78 $y -= int 0.5 * $self->{sh};
76 79
77 $::CONN->lookat ($x, $y) 80 $::CONN->lookat ($x, $y)
78 if $::CONN; 81 if $::CONN;
79 82
80 } elsif ($ev->{button} == 2) { 83 } elsif ($ev->{button} == 2) {
84 $self->grab_focus;
85 return unless $::CONN;
86
81 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 87 my ($ox, $oy) = ($ev->{x}, $ev->{y});
82 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 88 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
83 89
84 $self->{motion} = sub { 90 $self->{motion} = sub {
85 my ($ev, $x, $y) = @_; 91 my ($ev, $x, $y) = @_;
… …
89 $::CFG->{map_shift_x} = $bw + $x - $ox; 95 $::CFG->{map_shift_x} = $bw + $x - $ox;
90 $::CFG->{map_shift_y} = $bh + $y - $oy; 96 $::CFG->{map_shift_y} = $bh + $y - $oy;
91 97
92 $self->update; 98 $self->update;
93 }; 99 };
100 } elsif ($ev->{button} == 3) {
101 (new CFClient::UI::Menu
102 items => [
103 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
104 ["Stats &amp; Skills…\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
105 ["Inventory…\tF3", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
106 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
107 ["Setup… \tF5", sub { $::SETUP_DIALOG->toggle_visibility }],
108 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
109 [
110 $::PICKUP_ENABLE->{state}
111 ? "Disable automatic pickup"
112 : "Enable automatic pickup",
113 sub { $::PICKUP_ENABLE->toggle }
114 ],
115 ],
116 )->popup ($ev);
94 } 117 }
95 118
96 1 119 1
97} 120}
98 121
99sub button_up { 122sub invoke_button_up {
100 my ($self, $ev, $x, $y) = @_; 123 my ($self, $ev, $x, $y) = @_;
101 124
102 delete $self->{motion}; 125 delete $self->{motion};
103 126
104 1 127 1
105} 128}
106 129
107sub mouse_motion { 130sub invoke_mouse_motion {
108 my ($self, $ev, $x, $y) = @_; 131 my ($self, $ev, $x, $y) = @_;
109 132
110 if ($self->{motion}) { 133 if ($self->{motion}) {
111 $self->{motion}->($ev, $x, $y); 134 $self->{motion}->($ev, $x, $y);
112 } else { 135 } else {
… …
116 1 139 1
117} 140}
118 141
119sub size_request { 142sub size_request {
120 ( 143 (
121 1 + 32 * int $::WIDTH / 32, 144 32 * CFClient::ceil $::WIDTH / 32,
122 1 + 32 * int $::HEIGHT / 32, 145 32 * CFClient::ceil $::HEIGHT / 32,
123 ) 146 )
124} 147}
125 148
126sub update { 149sub update {
127 my ($self) = @_; 150 my ($self) = @_;
… …
144 CFClient::SDLK_RIGHT, [3, "east"], 167 CFClient::SDLK_RIGHT, [3, "east"],
145 CFClient::SDLK_DOWN, [5, "south"], 168 CFClient::SDLK_DOWN, [5, "south"],
146 CFClient::SDLK_LEFT, [7, "west"], 169 CFClient::SDLK_LEFT, [7, "west"],
147); 170);
148 171
149sub key_down { 172sub invoke_key_down {
150 my ($self, $ev) = @_; 173 my ($self, $ev) = @_;
151
152 return 0 unless $::CONN;
153 174
154 my $mod = $ev->{mod}; 175 my $mod = $ev->{mod};
155 my $sym = $ev->{sym}; 176 my $sym = $ev->{sym};
156 my $uni = $ev->{unicode}; 177 my $uni = $ev->{unicode};
157 178
179 $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT;
180
181 if ($uni == ord "\t") {
182 $::PL_WINDOW->toggle_visibility;
183 } elsif ($sym == CFClient::SDLK_F1 && !$mod) {
184 $::HELP_WINDOW->toggle_visibility;
185 } elsif ($sym == CFClient::SDLK_F2 && !$mod) {
186 ::toggle_player_page ($::STATS_PAGE);
187 } elsif ($sym == CFClient::SDLK_F3 && !$mod) {
188 ::toggle_player_page ($::INVENTORY_PAGE);
189 } elsif ($sym == CFClient::SDLK_F4 && !$mod) {
190 ::toggle_player_page ($::SPELL_PAGE);
191 } elsif ($sym == CFClient::SDLK_F5 && !$mod) {
192 $::SETUP_DIALOG->toggle_visibility;
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 $::BIND_EDITOR->cfg_bind ($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 (!$::CONN) {
206 return 0; # bindings further down need a valid connection
207
158 if ($sym == CFClient::SDLK_KP5) { 208 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) {
159 $::CONN->user_send ("stay fire"); 209 $::CONN->user_send ("stay fire");
160 } elsif ($uni == ord ",") { 210 } elsif ($uni == ord ",") {
161 $::CONN->user_send ("take"); 211 $::CONN->user_send ("take");
162 } elsif ($uni == ord " ") { 212 } elsif ($uni == ord " ") {
163 $::CONN->user_send ("apply"); 213 $::CONN->user_send ("apply");
164 } elsif ($uni == ord ".") { 214 } elsif ($uni == ord ".") {
165 $::CONN->user_send ($self->{completer}{last_command}) 215 $::CONN->user_send ($self->{completer}{last_command})
166 if exists $self->{completer}{last_command}; 216 if exists $self->{completer}{last_command};
167 } elsif ($uni == ord "\t") { 217 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
168 $::INV_WINDOW->toggle_visibility; 218 $::CONN->user_send ($_) for @$bind_cmd;
169 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 219 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
170 $::CONN->user_send ("rotateshoottype +"); 220 $::CONN->user_send ("rotateshoottype +");
171 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 221 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
172 $::CONN->user_send ("rotateshoottype -"); 222 $::CONN->user_send ("rotateshoottype -");
173 } elsif ($uni == ord '"') { 223 } elsif ($uni == ord '"') {
174 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 224 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
175 $self->{completer}->show; 225 $self->{completer}->show;
176 } elsif ($uni == ord "'") { 226 } elsif ($uni == ord "'") {
… …
187 $self->{ctrl}++; 237 $self->{ctrl}++;
188 $::CONN->user_send ("run $DIR{$sym}[0]"); 238 $::CONN->user_send ("run $DIR{$sym}[0]");
189 } else { 239 } else {
190 $::CONN->user_send ("$DIR{$sym}[1]"); 240 $::CONN->user_send ("$DIR{$sym}[1]");
191 } 241 }
192 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
193 $::BIND_EDITOR->set_binding (undef, undef, [],
194 sub {
195 my ($mod, $sym, $cmds) = @_;
196 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
197 });
198 $::BIND_EDITOR->start;
199 $::BIND_EDITOR->show;
200 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
201 $::BIND_EDITOR->stop;
202 $::BIND_EDITOR->ask_for_bind_and_commit;
203 $::BIND_EDITOR->hide;
204 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
205 $::CONN->user_send ($_) for @$bind_cmd;
206 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 242 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
207 $self->{completer}->key_down ($ev); 243 $self->{completer}->invoke_key_down ($ev);
208 $self->{completer}->show; 244 $self->{completer}->show;
209 } else { 245 } else {
210 return 0; 246 return 0;
211 } 247 }
212 248
213 1 249 1
214} 250}
215 251
216sub key_up { 252sub invoke_key_up {
217 my ($self, $ev) = @_; 253 my ($self, $ev) = @_;
218 254
219 my $res = 0; 255 my $res = 0;
220 my $mod = $ev->{mod}; 256 my $mod = $ev->{mod};
221 my $sym = $ev->{sym}; 257 my $sym = $ev->{sym};
… …
244 } 280 }
245 281
246 $res 282 $res
247} 283}
248 284
285sub set_magicmap {
286 my ($self, $w, $h, $x, $y, $data) = @_;
287
288 $x -= $::MAP->ox + int 0.5 * $::MAP->w;
289 $y -= $::MAP->oy + int 0.5 * $::MAP->h;
290
291 $self->{magicmap} = [$x, $y, $w, $h, $data];
292
293 $self->update;
294}
295
249sub draw { 296sub draw {
250 my ($self) = @_; 297 my ($self) = @_;
251 298
252 return unless $::MAP; 299 return unless $::MAP;
253 300
… …
264 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; 311 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize;
265 312
266 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 313 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
267 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 314 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
268 315
269 my $sw = $self->{sw} = 1 + CFClient::ceil $::WIDTH / $tilesize; 316 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize;
270 my $sh = $self->{sh} = 1 + CFClient::ceil $::HEIGHT / $tilesize; 317 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize;
271 318
272 if ($::CFG->{fow_enable}) { 319 if ($::CFG->{fow_enable}) {
273 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); 320 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
274 321
275 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 322 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
… …
302 glTranslate $sx0, $sy0; 349 glTranslate $sx0, $sy0;
303 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 350 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
304 351
305 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 352 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
306 353
354 glScale 32, 32;
355
307 if (my $tex = $self->{fow_texture}) { 356 if (my $tex = $self->{fow_texture}) {
308 glEnable GL_TEXTURE_2D; 357 glEnable GL_TEXTURE_2D;
309 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 358 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
310 359
311 glScale 32, 32;
312 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 360 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
313 $self->{fow_texture}->draw_quad_alpha (0, 0); 361 $self->{fow_texture}->draw_quad_alpha (0, 0);
314 362
315 glDisable GL_TEXTURE_2D; 363 glDisable GL_TEXTURE_2D;
316 } 364 }
317 365
366 if ($self->{magicmap}) {
367 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
368
369 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
370 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
371
372 glTranslate - $x - 1, - $y - 1;
373 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
374 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
375 }
376
318 glPopMatrix; 377 glPopMatrix;
319
320 glEndList; 378 glEndList;
321 } 379 }
322 380
323 glPushMatrix;
324 glCallList $self->{list}; 381 glCallList $self->{list};
325 glPopMatrix;
326 382
327 # TNT2 emulates logops in software (or worse :) 383 # TNT2 emulates logops in software (or worse :)
328 unless ($focused) { 384 unless ($focused) {
329 glColor 0.4, 0.2, 0.2, 0.6; 385 glColor 0.4, 0.2, 0.2, 0.6;
330 glEnable GL_BLEND; 386 glEnable GL_BLEND;
… …
356 412
357sub size_request { 413sub size_request {
358 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 414 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
359} 415}
360 416
361sub size_allocate { 417sub invoke_size_allocate {
362 my ($self, $w, $h) = @_; 418 my ($self, $w, $h) = @_;
363 419
364 $self->SUPER::size_allocate ($w, $h);
365 $self->update; 420 $self->update;
421
422 1
366} 423}
367 424
368sub update { 425sub update {
369 my ($self) = @_; 426 my ($self) = @_;
370 427
… …
455 ]; 512 ];
456 513
457 $self->{entry} = new CFClient::UI::Entry 514 $self->{entry} = new CFClient::UI::Entry
458 on_changed => sub { 515 on_changed => sub {
459 $self->update_labels; 516 $self->update_labels;
517 0
460 }, 518 },
461 on_button_down => sub { 519 on_button_down => sub {
462 my ($entry, $ev, $x, $y) = @_; 520 my ($entry, $ev, $x, $y) = @_;
463 521
464 if ($ev->{button} == 3) { 522 if ($ev->{button} == 3) {
465 (new CFClient::UI::Menu 523 (new CFClient::UI::Menu
466 items => [ 524 items => [
525 ["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key"
467 ["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->focus_in }) }] 526 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
468 ], 527 ],
469 )->popup ($ev); 528 )->popup ($ev);
470 return 1; 529 return 1;
471 } 530 }
472 0 531 0
… …
479 if ($ev->{sym} == 13) { 538 if ($ev->{sym} == 13) {
480 if (exists $self->{select}) { 539 if (exists $self->{select}) {
481 $self->{last_command} = $self->{select}; 540 $self->{last_command} = $self->{select};
482 $::CONN->user_send ($self->{select}); 541 $::CONN->user_send ($self->{select});
483 542
484 unshift @{$self->{history}}, $self->{select}; 543 unshift @{$self->{history}}, $self->{entry}->get_text;
485 $self->{hist_ptr} = 0; 544 $self->{hist_ptr} = 0;
486 545
487 $self->hide; 546 $self->hide;
488 } 547 }
489 } elsif ($ev->{sym} == 27) { 548 } elsif ($ev->{sym} == 27) {
490 $self->{hist_ptr} = 0; 549 $self->{hist_ptr} = 0;
491 $self->hide; 550 $self->hide;
492 return;
493 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 551 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
494 if ($self->{hist_ptr} > 1) { 552 if ($self->{hist_ptr} > 1) {
495 $self->{hist_ptr}--; 553 $self->{hist_ptr}--;
496 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 554 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
497 } elsif ($self->{hist_ptr} > 0) { 555 } elsif ($self->{hist_ptr} > 0) {
… …
537 595
538 $self->{entry}->set_text ($prefix); 596 $self->{entry}->set_text ($prefix);
539 $self->show; 597 $self->show;
540} 598}
541 599
542sub size_allocate { 600sub invoke_size_allocate {
543 my ($self, $w, $h) = @_; 601 my ($self, $w, $h) = @_;
544 602
545 $self->SUPER::size_allocate ($w, $h);
546 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 603 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
604
605 $self->SUPER::invoke_size_allocate ($w, $h)
547} 606}
548 607
549sub show { 608sub show {
550 my ($self) = @_; 609 my ($self) = @_;
551 610
552 $self->SUPER::show; 611 $self->SUPER::show;
553 $self->{entry}->focus_in; 612 $self->{entry}->grab_focus;
554} 613}
555 614
556sub hide { 615sub hide {
557 my ($self) = @_; 616 my ($self) = @_;
558 617
559 $self->SUPER::hide; 618 $self->SUPER::hide;
560 $self->{entry}->set_text (""); 619 $self->{entry}->set_text ("");
561} 620}
562 621
563sub key_down { 622sub invoke_key_down {
564 my ($self, $ev) = @_; 623 my ($self, $ev) = @_;
565 624
566 $self->{entry}->key_down ($ev) 625 $self->{entry}->emit (key_down => $ev)
567} 626}
568 627
569sub update_labels { 628sub update_labels {
570 my ($self) = @_; 629 my ($self) = @_;
571 630
… …
658 $label->set_text (""); 717 $label->set_text ("");
659 $label->set_tooltip (""); 718 $label->set_tooltip ("");
660 } 719 }
661 720
662 $self->update; 721 $self->update;
663 ###
664} 722}
665 723
666sub _draw { 724sub _draw {
667 my ($self) = @_; 725 my ($self) = @_;
668 726

Diff Legend

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