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.77 by root, Sun Jul 23 02:44:05 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 (
… …
26 @_ 30 @_
27 ); 31 );
28 32
29 $self->{completer} = new CFClient::MapWidget::Command:: 33 $self->{completer} = new CFClient::MapWidget::Command::
30 command => $self->{command}, 34 command => $self->{command},
31 can_focus => 1,
32 tooltip => "<b>The Command Completer</b>\n\n" 35 tooltip => "<b>The Command Completer</b>\n\n"
33 . "This is your central interface to send text commands to the server. " 36 . "This is your central interface to send text commands to the server. "
34 . "To enter a verbatim command to send to the server, just type the command, " 37 . "To enter a verbatim command to send to the server, just type the command, "
35 . "followed by a space, and press return. " 38 . "followed by a space, and press return. "
36 . "Typing the initial letters of words (or just any letters) displays guesses " 39 . "Typing the initial letters of words (or just any letters) displays guesses "
37 . "for commands you might want to use.\n" 40 . "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" 41 . "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.", 42 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
40 ; 43 ;
41 44
42 $self 45 $self
43} 46}
44 47
… …
56 59
57sub clr_commands { 60sub clr_commands {
58 my ($self) = @_; 61 my ($self) = @_;
59 62
60 %{$self->{completer}{command}} = (); 63 %{$self->{completer}{command}} = ();
61}
62 64
65 $self->{completer}->hide
66 if $self->{completer};
67}
68
63sub button_down { 69sub invoke_button_down {
64 my ($self, $ev, $x, $y) = @_; 70 my ($self, $ev, $x, $y) = @_;
65 71
66 return unless $::CONN;
67
68 $self->focus_in;
69
70 if ($ev->{button} == 1) { 72 if ($ev->{button} == 1) {
73 $self->grab_focus;
74 return unless $::CONN;
75
71 my $x = CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 76 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}; 77 my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
73 78
74 $x -= int 0.5 * $self->{sw}; 79 $x -= int 0.5 * $self->{sw};
75 $y -= int 0.5 * $self->{sh}; 80 $y -= int 0.5 * $self->{sh};
76 81
77 $::CONN->lookat ($x, $y) 82 $::CONN->lookat ($x, $y)
78 if $::CONN; 83 if $::CONN;
79 84
80 } elsif ($ev->{button} == 2) { 85 } elsif ($ev->{button} == 2) {
86 $self->grab_focus;
87 return unless $::CONN;
88
81 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 89 my ($ox, $oy) = ($ev->{x}, $ev->{y});
82 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 90 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
83 91
84 $self->{motion} = sub { 92 $self->{motion} = sub {
85 my ($ev, $x, $y) = @_; 93 my ($ev, $x, $y) = @_;
… …
89 $::CFG->{map_shift_x} = $bw + $x - $ox; 97 $::CFG->{map_shift_x} = $bw + $x - $ox;
90 $::CFG->{map_shift_y} = $bh + $y - $oy; 98 $::CFG->{map_shift_y} = $bh + $y - $oy;
91 99
92 $self->update; 100 $self->update;
93 }; 101 };
102 } elsif ($ev->{button} == 3) {
103 (new CFClient::UI::Menu
104 items => [
105 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
106 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
107 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
108 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
109 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
110 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
111 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
112 [
113 $::PICKUP_ENABLE->{state}
114 ? "Disable automatic pickup"
115 : "Enable automatic pickup",
116 sub { $::PICKUP_ENABLE->toggle }
117 ],
118 ],
119 )->popup ($ev);
94 } 120 }
95 121
96 1 122 1
97} 123}
98 124
99sub button_up { 125sub invoke_button_up {
100 my ($self, $ev, $x, $y) = @_; 126 my ($self, $ev, $x, $y) = @_;
101 127
102 delete $self->{motion}; 128 delete $self->{motion};
103 129
104 1 130 1
105} 131}
106 132
107sub mouse_motion { 133sub invoke_mouse_motion {
108 my ($self, $ev, $x, $y) = @_; 134 my ($self, $ev, $x, $y) = @_;
109 135
110 if ($self->{motion}) { 136 if ($self->{motion}) {
111 $self->{motion}->($ev, $x, $y); 137 $self->{motion}->($ev, $x, $y);
112 } else { 138 } else {
… …
116 1 142 1
117} 143}
118 144
119sub size_request { 145sub size_request {
120 ( 146 (
121 1 + 32 * int $::WIDTH / 32, 147 32 * CFClient::ceil $::WIDTH / 32,
122 1 + 32 * int $::HEIGHT / 32, 148 32 * CFClient::ceil $::HEIGHT / 32,
123 ) 149 )
124} 150}
125 151
126sub update { 152sub update {
127 my ($self) = @_; 153 my ($self) = @_;
… …
144 CFClient::SDLK_RIGHT, [3, "east"], 170 CFClient::SDLK_RIGHT, [3, "east"],
145 CFClient::SDLK_DOWN, [5, "south"], 171 CFClient::SDLK_DOWN, [5, "south"],
146 CFClient::SDLK_LEFT, [7, "west"], 172 CFClient::SDLK_LEFT, [7, "west"],
147); 173);
148 174
149sub key_down { 175sub invoke_key_down {
150 my ($self, $ev) = @_; 176 my ($self, $ev) = @_;
151
152 return 0 unless $::CONN;
153 177
154 my $mod = $ev->{mod}; 178 my $mod = $ev->{mod};
155 my $sym = $ev->{sym}; 179 my $sym = $ev->{sym};
156 my $uni = $ev->{unicode}; 180 my $uni = $ev->{unicode};
157 181
182 $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT;
183
184 if ($uni == ord "\t") {
185 $::PL_WINDOW->toggle_visibility;
186 } elsif ($sym == CFClient::SDLK_F1 && !$mod) {
187 $::HELP_WINDOW->toggle_visibility;
188 } elsif ($sym == CFClient::SDLK_F2 && !$mod) {
189 ::toggle_player_page ($::STATS_PAGE);
190 } elsif ($sym == CFClient::SDLK_F3 && !$mod) {
191 ::toggle_player_page ($::SKILL_PAGE);
192 } elsif ($sym == CFClient::SDLK_F4 && !$mod) {
193 ::toggle_player_page ($::SPELL_PAGE);
194 } elsif ($sym == CFClient::SDLK_F5 && !$mod) {
195 ::toggle_player_page ($::INVENTORY_PAGE);
196 } elsif ($sym == CFClient::SDLK_F9 && !$mod) {
197 $::SETUP_DIALOG->toggle_visibility;
198 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
199 $::BIND_EDITOR->set_binding (undef, undef, [],
200 sub {
201 my ($mod, $sym, $cmds) = @_;
202 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
203 });
204 $::BIND_EDITOR->start;
205 $::BIND_EDITOR->show;
206 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
207 $::BIND_EDITOR->stop;
208 $::BIND_EDITOR->ask_for_bind_and_commit;
209 $::BIND_EDITOR->hide;
210 } elsif (!$::CONN) {
211 return 0; # bindings further down need a valid connection
212
158 if ($sym == CFClient::SDLK_KP5) { 213 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) {
159 $::CONN->user_send ("stay fire"); 214 $::CONN->user_send ("stay fire");
160 } elsif ($uni == ord ",") { 215 } elsif ($uni == ord ",") {
161 $::CONN->user_send ("take"); 216 $::CONN->user_send ("take");
162 } elsif ($uni == ord " ") { 217 } elsif ($uni == ord " ") {
163 $::CONN->user_send ("apply"); 218 $::CONN->user_send ("apply");
164 } elsif ($uni == ord ".") { 219 } elsif ($uni == ord ".") {
165 $::CONN->user_send ($self->{completer}{last_command}) 220 $::CONN->user_send ($self->{completer}{last_command})
166 if exists $self->{completer}{last_command}; 221 if exists $self->{completer}{last_command};
167 } elsif ($uni == ord "\t") { 222 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
168 $::INV_WINDOW->toggle_visibility; 223 $::CONN->user_send ($_) for @$bind_cmd;
169 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 224 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
170 $::CONN->user_send ("rotateshoottype +"); 225 $::CONN->user_send ("rotateshoottype +");
171 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 226 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
172 $::CONN->user_send ("rotateshoottype -"); 227 $::CONN->user_send ("rotateshoottype -");
173 } elsif ($uni == ord '"') { 228 } elsif ($uni == ord '"') {
174 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 229 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
175 $self->{completer}->show; 230 $self->{completer}->show;
176 } elsif ($uni == ord "'") { 231 } elsif ($uni == ord "'") {
… …
187 $self->{ctrl}++; 242 $self->{ctrl}++;
188 $::CONN->user_send ("run $DIR{$sym}[0]"); 243 $::CONN->user_send ("run $DIR{$sym}[0]");
189 } else { 244 } else {
190 $::CONN->user_send ("$DIR{$sym}[1]"); 245 $::CONN->user_send ("$DIR{$sym}[1]");
191 } 246 }
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')) { 247 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
207 $self->{completer}->key_down ($ev); 248 $self->{completer}->inject_key_down ($ev);
208 $self->{completer}->show; 249 $self->{completer}->show;
209 } else { 250 } else {
210 return 0; 251 return 0;
211 } 252 }
212 253
213 1 254 1
214} 255}
215 256
216sub key_up { 257sub invoke_key_up {
217 my ($self, $ev) = @_; 258 my ($self, $ev) = @_;
218 259
219 my $res = 0; 260 my $res = 0;
220 my $mod = $ev->{mod}; 261 my $mod = $ev->{mod};
221 my $sym = $ev->{sym}; 262 my $sym = $ev->{sym};
… …
244 } 285 }
245 286
246 $res 287 $res
247} 288}
248 289
290sub set_magicmap {
291 my ($self, $w, $h, $x, $y, $data) = @_;
292
293 $x -= $::MAP->ox + int 0.5 * $::MAP->w;
294 $y -= $::MAP->oy + int 0.5 * $::MAP->h;
295
296 $self->{magicmap} = [$x, $y, $w, $h, $data];
297
298 $self->update;
299}
300
249sub draw { 301sub draw {
250 my ($self) = @_; 302 my ($self) = @_;
251 303
252 return unless $::MAP; 304 return unless $::MAP;
253 305
… …
264 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; 316 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize;
265 317
266 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 318 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
267 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 319 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
268 320
269 my $sw = $self->{sw} = 1 + CFClient::ceil $::WIDTH / $tilesize; 321 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize;
270 my $sh = $self->{sh} = 1 + CFClient::ceil $::HEIGHT / $tilesize; 322 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize;
271 323
272 if ($::CFG->{fow_enable}) { 324 if ($::CFG->{fow_enable}) {
273 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); 325 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
274 326
275 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 327 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
… …
302 glTranslate $sx0, $sy0; 354 glTranslate $sx0, $sy0;
303 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 355 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
304 356
305 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 357 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
306 358
359 glScale 32, 32;
360
307 if (my $tex = $self->{fow_texture}) { 361 if (my $tex = $self->{fow_texture}) {
308 glEnable GL_TEXTURE_2D; 362 glEnable GL_TEXTURE_2D;
309 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 363 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
310 364
311 glScale 32, 32;
312 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 365 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
313 $self->{fow_texture}->draw_quad_alpha (0, 0); 366 $self->{fow_texture}->draw_quad_alpha (0, 0);
314 367
315 glDisable GL_TEXTURE_2D; 368 glDisable GL_TEXTURE_2D;
316 } 369 }
317 370
371 if ($self->{magicmap}) {
372 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
373
374 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
375 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
376
377 glTranslate - $x - 1, - $y - 1;
378 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
379 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
380 }
381
318 glPopMatrix; 382 glPopMatrix;
319
320 glEndList; 383 glEndList;
321 } 384 }
322 385
323 glPushMatrix;
324 glCallList $self->{list}; 386 glCallList $self->{list};
325 glPopMatrix;
326 387
327 # TNT2 emulates logops in software (or worse :) 388 # TNT2 emulates logops in software (or worse :)
328 unless ($focused) { 389 unless ($focused) {
329 glColor 0.4, 0.2, 0.2, 0.6; 390 glColor 0.4, 0.2, 0.2, 0.6;
330 glEnable GL_BLEND; 391 glEnable GL_BLEND;
… …
356 417
357sub size_request { 418sub size_request {
358 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 419 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
359} 420}
360 421
361sub size_allocate { 422sub invoke_size_allocate {
362 my ($self, $w, $h) = @_; 423 my ($self, $w, $h) = @_;
363 424
364 $self->SUPER::size_allocate ($w, $h);
365 $self->update; 425 $self->update;
426
427 1
366} 428}
367 429
368sub update { 430sub update {
369 my ($self) = @_; 431 my ($self) = @_;
370 432
… …
455 ]; 517 ];
456 518
457 $self->{entry} = new CFClient::UI::Entry 519 $self->{entry} = new CFClient::UI::Entry
458 on_changed => sub { 520 on_changed => sub {
459 $self->update_labels; 521 $self->update_labels;
522 0
460 }, 523 },
461 on_button_down => sub { 524 on_button_down => sub {
462 my ($entry, $ev, $x, $y) = @_; 525 my ($entry, $ev, $x, $y) = @_;
463 526
464 if ($ev->{button} == 3) { 527 if ($ev->{button} == 3) {
465 (new CFClient::UI::Menu 528 (new CFClient::UI::Menu
466 items => [ 529 items => [
530 ["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 }) }] 531 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
468 ], 532 ],
469 )->popup ($ev); 533 )->popup ($ev);
470 return 1; 534 return 1;
471 } 535 }
472 0 536 0
… …
479 if ($ev->{sym} == 13) { 543 if ($ev->{sym} == 13) {
480 if (exists $self->{select}) { 544 if (exists $self->{select}) {
481 $self->{last_command} = $self->{select}; 545 $self->{last_command} = $self->{select};
482 $::CONN->user_send ($self->{select}); 546 $::CONN->user_send ($self->{select});
483 547
484 unshift @{$self->{history}}, $self->{select}; 548 unshift @{$self->{history}}, $self->{entry}->get_text;
485 $self->{hist_ptr} = 0; 549 $self->{hist_ptr} = 0;
486 550
487 $self->hide; 551 $self->hide;
488 } 552 }
489 } elsif ($ev->{sym} == 27) { 553 } elsif ($ev->{sym} == 27) {
490 $self->{hist_ptr} = 0; 554 $self->{hist_ptr} = 0;
491 $self->hide; 555 $self->hide;
492 return;
493 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 556 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
494 if ($self->{hist_ptr} > 1) { 557 if ($self->{hist_ptr} > 1) {
495 $self->{hist_ptr}--; 558 $self->{hist_ptr}--;
496 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 559 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
497 } elsif ($self->{hist_ptr} > 0) { 560 } elsif ($self->{hist_ptr} > 0) {
… …
537 600
538 $self->{entry}->set_text ($prefix); 601 $self->{entry}->set_text ($prefix);
539 $self->show; 602 $self->show;
540} 603}
541 604
542sub size_allocate { 605sub invoke_size_allocate {
543 my ($self, $w, $h) = @_; 606 my ($self, $w, $h) = @_;
544 607
545 $self->SUPER::size_allocate ($w, $h);
546 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 608 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
609
610 $self->SUPER::invoke_size_allocate ($w, $h)
547} 611}
548 612
549sub show { 613sub show {
550 my ($self) = @_; 614 my ($self) = @_;
551 615
552 $self->SUPER::show; 616 $self->SUPER::show;
553 $self->{entry}->focus_in; 617 $self->{entry}->grab_focus;
554} 618}
555 619
556sub hide { 620sub hide {
557 my ($self) = @_; 621 my ($self) = @_;
622
623 $self->{hist_ptr} = 0;
558 624
559 $self->SUPER::hide; 625 $self->SUPER::hide;
560 $self->{entry}->set_text (""); 626 $self->{entry}->set_text ("");
561} 627}
562 628
563sub key_down { 629sub inject_key_down {
564 my ($self, $ev) = @_; 630 my ($self, $ev) = @_;
565 631
632 $self->{entry}->grab_focus;
566 $self->{entry}->key_down ($ev) 633 $self->{entry}->emit (key_down => $ev);
567} 634}
568 635
569sub update_labels { 636sub update_labels {
570 my ($self) = @_; 637 my ($self) = @_;
571 638
… …
658 $label->set_text (""); 725 $label->set_text ("");
659 $label->set_tooltip (""); 726 $label->set_tooltip ("");
660 } 727 }
661 728
662 $self->update; 729 $self->update;
663 ###
664} 730}
665 731
666sub _draw { 732sub _draw {
667 my ($self) = @_; 733 my ($self) = @_;
668 734

Diff Legend

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