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.36 by root, Thu May 25 00:26:19 2006 UTC vs.
Revision 1.60 by root, Thu Jun 15 08:29:18 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},
24 can_focus => 1, 31 can_focus => 1,
32 tooltip => "<b>The Command Completer</b>\n\n"
33 . "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, "
35 . "followed by a space, and press return. "
36 . "Typing the initial letters of words (or just any letters) displays guesses "
37 . "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"
39 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.",
25 ; 40 ;
26 41
27 $self 42 $self
28} 43}
29 44
… …
31 my ($self, $command, $tooltip, $widget, $cb) = @_; 46 my ($self, $command, $tooltip, $widget, $cb) = @_;
32 47
33 (my $data = $command) =~ s/\\//g; 48 (my $data = $command) =~ s/\\//g;
34 49
35 $tooltip =~ s/^\s+//; 50 $tooltip =~ s/^\s+//;
36
37 $tooltip = "<big>$data</big>\n\n$tooltip"; 51 $tooltip = "<big>$data</big>\n\n$tooltip";
38
39 $tooltip =~ s/\s+$//; 52 $tooltip =~ s/\s+$//;
40 53
41 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; 54 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
42} 55}
43 56
… …
48} 61}
49 62
50sub button_down { 63sub button_down {
51 my ($self, $ev, $x, $y) = @_; 64 my ($self, $ev, $x, $y) = @_;
52 65
66 return unless $::CONN;
67
53 $self->focus_in; 68 $self->focus_in;
54 69
55 if ($ev->{button} == 2) { 70 if ($ev->{button} == 1) {
71 my $x = CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
72 my $y = CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
73
74 $x -= int 0.5 * $self->{sw};
75 $y -= int 0.5 * $self->{sh};
76
77 $::CONN->lookat ($x, $y)
78 if $::CONN;
79
80 } elsif ($ev->{button} == 2) {
56 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 81 my ($ox, $oy) = ($ev->{x}, $ev->{y});
57 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 82 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
58 83
59 $self->{motion} = sub { 84 $self->{motion} = sub {
60 my ($ev, $x, $y) = @_; 85 my ($ev, $x, $y) = @_;
… …
65 $::CFG->{map_shift_y} = $bh + $y - $oy; 90 $::CFG->{map_shift_y} = $bh + $y - $oy;
66 91
67 $self->update; 92 $self->update;
68 }; 93 };
69 } 94 }
95
96 1
70} 97}
71 98
72sub button_up { 99sub button_up {
73 my ($self, $ev, $x, $y) = @_; 100 my ($self, $ev, $x, $y) = @_;
74 101
75 delete $self->{motion}; 102 delete $self->{motion};
103
104 1
76} 105}
77 106
78sub mouse_motion { 107sub mouse_motion {
79 my ($self, $ev, $x, $y) = @_; 108 my ($self, $ev, $x, $y) = @_;
80 109
110 if ($self->{motion}) {
81 $self->{motion}->($ev, $x, $y) if $self->{motion}; 111 $self->{motion}->($ev, $x, $y);
112 } else {
113 return 0;
114 }
115
116 1
82} 117}
83 118
84sub size_request { 119sub size_request {
85 ( 120 (
86 1 + 32 * int $::WIDTH / 32, 121 1 + 32 * int $::WIDTH / 32,
… …
112); 147);
113 148
114sub key_down { 149sub key_down {
115 my ($self, $ev) = @_; 150 my ($self, $ev) = @_;
116 151
117 return unless $::CONN; 152 return 0 unless $::CONN;
118 153
119 my $mod = $ev->{mod}; 154 my $mod = $ev->{mod};
120 my $sym = $ev->{sym}; 155 my $sym = $ev->{sym};
121 my $uni = $ev->{unicode}; 156 my $uni = $ev->{unicode};
122 157
… …
124 $::CONN->user_send ("stay fire"); 159 $::CONN->user_send ("stay fire");
125 } elsif ($uni == ord ",") { 160 } elsif ($uni == ord ",") {
126 $::CONN->user_send ("take"); 161 $::CONN->user_send ("take");
127 } elsif ($uni == ord " ") { 162 } elsif ($uni == ord " ") {
128 $::CONN->user_send ("apply"); 163 $::CONN->user_send ("apply");
164 } elsif ($uni == ord ".") {
165 $::CONN->user_send ($self->{completer}{last_command})
166 if exists $self->{completer}{last_command};
129 } elsif ($uni == ord "\t") { 167 } elsif ($uni == ord "\t") {
130 # TODO: toggle inventory 168 $::INV_WINDOW->toggle_visibility;
131 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 169 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") {
132 $::CONN->user_send ("rotateshoottype +"); 170 $::CONN->user_send ("rotateshoottype +");
133 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 171 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") {
134 $::CONN->user_send ("rotateshoottype -"); 172 $::CONN->user_send ("rotateshoottype -");
135 } elsif ($uni == ord '"') { 173 } elsif ($uni == ord '"') {
… …
139 $self->{completer}->set_prefix (""); 177 $self->{completer}->set_prefix ("");
140 $self->{completer}->show; 178 $self->{completer}->show;
141 } elsif (exists $DIR{$sym}) { 179 } elsif (exists $DIR{$sym}) {
142 if ($mod & CFClient::KMOD_SHIFT) { 180 if ($mod & CFClient::KMOD_SHIFT) {
143 $self->{shft}++; 181 $self->{shft}++;
182 if ($DIR{$sym}[0] != $self->{fire_dir}) {
144 $::CONN->user_send ("fire $DIR{$sym}[0]"); 183 $::CONN->user_send ("fire $DIR{$sym}[0]");
184 }
185 $self->{fire_dir} = $DIR{$sym}[0];
145 } elsif ($mod & CFClient::KMOD_CTRL) { 186 } elsif ($mod & CFClient::KMOD_CTRL) {
146 $self->{ctrl}++; 187 $self->{ctrl}++;
147 $::CONN->user_send ("run $DIR{$sym}[0]"); 188 $::CONN->user_send ("run $DIR{$sym}[0]");
148 } else { 189 } else {
149 $::CONN->user_send ("$DIR{$sym}[1]"); 190 $::CONN->user_send ("$DIR{$sym}[1]");
150 } 191 }
151 } elsif ($ev->{unicode}) { 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')) {
152 $self->{completer}->key_down ($ev); 207 $self->{completer}->key_down ($ev);
153 $self->{completer}->show; 208 $self->{completer}->show;
209 } else {
210 return 0;
211 }
212
154 } 213 1
155} 214}
156 215
157sub key_up { 216sub key_up {
158 my ($self, $ev) = @_; 217 my ($self, $ev) = @_;
159 218
219 my $res = 0;
160 my $mod = $ev->{mod}; 220 my $mod = $ev->{mod};
161 my $sym = $ev->{sym}; 221 my $sym = $ev->{sym};
162 222
223 if ($::CFG->{shift_fire_stop}) {
163 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 224 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
164 $::CONN->user_send ("fire_stop"); 225 $::CONN->user_send ("fire_stop");
226 delete $self->{fire_dir};
227 $res = 1;
228 }
229 } else {
230 if (exists $DIR{$sym} && delete $self->{shft}) {
231 $::CONN->user_send ("fire_stop");
232 delete $self->{fire_dir};
233 $res = 1;
234 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
235 $::CONN->user_send ("fire_stop");
236 delete $self->{fire_dir};
237 $res = 1;
238 }
165 } 239 }
240
166 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 241 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
167 $::CONN->user_send ("run_stop"); 242 $::CONN->user_send ("run_stop");
243 $res = 1;
168 } 244 }
245
246 $res
169} 247}
170 248
171sub draw { 249sub draw {
172 my ($self) = @_; 250 my ($self) = @_;
251
252 return unless $::MAP;
173 253
174 my $focused = $CFClient::UI::FOCUS == $self 254 my $focused = $CFClient::UI::FOCUS == $self
175 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 255 || $CFClient::UI::FOCUS == $self->{completer}{entry};
176 256
177 return 257 return
178 unless $focused || !$::FAST; 258 unless $focused || !$::FAST;
179 259
180 if (delete $self->{need_update}) { 260 if (delete $self->{need_update}) {
261 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
262
263 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize;
264 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize;
265
266 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
267 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
268
269 my $sw = $self->{sw} = 1 + CFClient::ceil $::WIDTH / $tilesize;
270 my $sh = $self->{sh} = 1 + CFClient::ceil $::HEIGHT / $tilesize;
271
272 if ($::CFG->{fow_enable}) {
273 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
274
275 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
276 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
277 glConvolutionFilter2D (
278 GL_CONVOLUTION_2D,
279 GL_ALPHA,
280 3, 3,
281 GL_ALPHA, GL_FLOAT,
282 (pack "f*", @{ $self->{smooth_matrix} }),
283 );
284 glEnable GL_CONVOLUTION_2D;
285 }
286
287 $self->{fow_texture} = new CFClient::Texture
288 w => $w,
289 h => $h,
290 data => $data,
291 internalformat => GL_ALPHA,
292 format => GL_ALPHA;
293
294 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
295 } else {
296 delete $self->{fow_texture};
297 }
298
181 glNewList $self->{list}; 299 glNewList $self->{list};
182 300
183 if ($::MAP) {
184 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
185 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
186
187 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
188 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
189
190 glPushMatrix; 301 glPushMatrix;
302 glTranslate $sx0, $sy0;
191 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 303 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
192 304
193 glTranslate $sx0 - 32, $sy0 - 32, 0; 305 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
194 306
195 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 307 if (my $tex = $self->{fow_texture}) {
196
197 if ($::CFG->{fow_enable}) {
198 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
199 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
200 glConvolutionFilter2D (
201 GL_CONVOLUTION_2D,
202 GL_ALPHA,
203 3, 3,
204 GL_ALPHA, GL_FLOAT,
205 pack "f*",
206 0.05, 0.13, 0.05,
207 0.13, 0.30, 0.13,
208 0.05, 0.13, 0.05,
209 );
210 glEnable GL_CONVOLUTION_2D;
211 }
212
213 $self->{fow_texture_name} ||= glGenTexture;
214 # try to re-use the texture name: TODO improve texture class instead
215
216 $self->{fow_texture} = new CFClient::Texture
217 w => $w,
218 h => $h,
219 data => $data,
220 name => $self->{fow_texture_name},
221 internalformat => GL_ALPHA,
222 format => GL_ALPHA;
223
224 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
225
226 glEnable GL_TEXTURE_2D; 308 glEnable GL_TEXTURE_2D;
227 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 309 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
228 310
311 glScale 32, 32;
229 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 312 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
230 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 313 $self->{fow_texture}->draw_quad_alpha (0, 0);
231 314
232 glDisable GL_TEXTURE_2D; 315 glDisable GL_TEXTURE_2D;
233 } 316 }
234 317
235 glPopMatrix; 318 glPopMatrix;
236 }
237 319
238 glEndList; 320 glEndList;
239 } 321 }
240 322
241 glPushMatrix; 323 glPushMatrix;
242 glCallList $self->{list}; 324 glCallList $self->{list};
243 glPopMatrix; 325 glPopMatrix;
244 326
245 # TNT2 emulates logops in software (or worse :) 327 # TNT2 emulates logops in software (or worse :)
246 if ($focused) { 328 unless ($focused) {
247 (delete $self->{out_of_focus})->destroy
248 if $self->{out_of_focus};
249 } else {
250 glColor 0.4, 0.2, 0.2, 0.6; 329 glColor 0.4, 0.2, 0.2, 0.6;
251 glEnable GL_BLEND; 330 glEnable GL_BLEND;
252 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 331 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
253 glBegin GL_QUADS; 332 glBegin GL_QUADS;
254 glVertex 0, 0; 333 glVertex 0, 0;
255 glVertex 0, $::HEIGHT; 334 glVertex 0, $::HEIGHT;
256 glVertex $::WIDTH, $::HEIGHT; 335 glVertex $::WIDTH, $::HEIGHT;
257 glVertex $::WIDTH, 0; 336 glVertex $::WIDTH, 0;
258 glEnd; 337 glEnd;
259 glDisable GL_BLEND; 338 glDisable GL_BLEND;
260
261 $self->{out_of_focus} ||= do {
262 my $label = new CFClient::UI::Label
263 x => 0,
264 y => 0,
265 z => 1,
266 ellipsise => 0,
267 text => "map out of focus (click map to play)";
268
269 $label->show;
270 $label->update;
271
272 $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
273 $label->move (
274 ($::WIDTH - $label->{w}) * 0.5,
275 ($::HEIGHT - $label->{h}) * 0.5,
276 );
277 });
278
279 $label
280 };
281 } 339 }
282} 340}
283 341
284sub DESTROY { 342sub DESTROY {
285 my $self = shift; 343 my $self = shift;
… …
395 fontsize => $_, 453 fontsize => $_,
396 ), (0.8) x 16 454 ), (0.8) x 16
397 ]; 455 ];
398 456
399 $self->{entry} = new CFClient::UI::Entry 457 $self->{entry} = new CFClient::UI::Entry
400 connect_changed => sub { 458 on_changed => sub {
401 $self->update_labels; 459 $self->update_labels;
402 }, 460 },
461 on_button_down => sub {
462 my ($entry, $ev, $x, $y) = @_;
463
464 if ($ev->{button} == 3) {
465 (new CFClient::UI::Menu
466 items => [
467 ["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->focus_in }) }]
468 ],
469 )->popup ($ev);
470 return 1;
471 }
472 0
473 },
403 connect_key_down => sub { 474 on_key_down => sub {
404 my ($entry, $ev) = @_; 475 my ($entry, $ev) = @_;
405 476
406 my $self = $entry->{parent}{parent}; 477 my $self = $entry->{parent}{parent};
407 478
408 if ($ev->{sym} == 13) { 479 if ($ev->{sym} == 13) {
409 if (exists $self->{select}) { 480 if (exists $self->{select}) {
481 $self->{last_command} = $self->{select};
410 $::CONN->user_send ($self->{select}); 482 $::CONN->user_send ($self->{select});
483
484 unshift @{$self->{history}}, $self->{select};
485 $self->{hist_ptr} = 0;
486
411 $self->hide; 487 $self->hide;
412 } 488 }
413 } elsif ($ev->{sym} == 27) { 489 } elsif ($ev->{sym} == 27) {
490 $self->{hist_ptr} = 0;
414 $self->hide; 491 $self->hide;
415 return; 492 return;
416 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 493 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
494 if ($self->{hist_ptr} > 1) {
495 $self->{hist_ptr}--;
496 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
497 } elsif ($self->{hist_ptr} > 0) {
498 $self->{hist_ptr}--;
499 $self->{entry}->set_text ($self->{hist_saveback});
500 } else {
417 ++$self->{select_offset} 501 ++$self->{select_offset}
418 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 502 if $self->{select_offset} < $#{ $self->{last_match} || [] };
503 }
419 $self->update_labels; 504 $self->update_labels;
420 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 505 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
506 if ($self->{select_offset}) {
421 --$self->{select_offset} 507 --$self->{select_offset}
508 } else {
509 unless ($self->{hist_ptr}) {
510 $self->{hist_saveback} = $self->{entry}->get_text;
511 }
512 if ($self->{hist_ptr} <= $#{$self->{history}}) {
422 if $self->{select_offset}; 513 $self->{hist_ptr}++;
514 }
515 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
516 if exists $self->{history}->[$self->{hist_ptr} - 1];
517 }
423 $self->update_labels; 518 $self->update_labels;
424 } else { 519 } else {
425 return 0; 520 return 0;
426 } 521 }
427 522
… …
446 541
447sub size_allocate { 542sub size_allocate {
448 my ($self, $w, $h) = @_; 543 my ($self, $w, $h) = @_;
449 544
450 $self->SUPER::size_allocate ($w, $h); 545 $self->SUPER::size_allocate ($w, $h);
451 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 546 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
452} 547}
453 548
454sub show { 549sub show {
455 my ($self) = @_; 550 my ($self) = @_;
456 551
… …
466} 561}
467 562
468sub key_down { 563sub key_down {
469 my ($self, $ev) = @_; 564 my ($self, $ev) = @_;
470 565
471 $self->{entry}->key_down ($ev); 566 $self->{entry}->key_down ($ev)
472} 567}
473 568
474sub update_labels { 569sub update_labels {
475 my ($self) = @_; 570 my ($self) = @_;
476 571
… …
509 604
510 @match = map $self->{command}{$_->[0]}, 605 @match = map $self->{command}{$_->[0]},
511 sort { 606 sort {
512 $a->[1] <=> $b->[1] 607 $a->[1] <=> $b->[1]
513 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 608 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
514 or (length $a->[0]) <=> (length $b->[0]) 609 or (length $b->[0]) <=> (length $a->[0])
515 } @match; 610 } @match;
516 } 611 }
517 612
518 $self->{last_search} = $cmd; 613 $self->{last_search} = $text;
519 $self->{last_match} = \@match; 614 $self->{last_match} = \@match;
520 615
521 $self->{select_offset} = 0; 616 $self->{select_offset} = 0;
522 } 617 }
523 618

Diff Legend

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