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.21 by root, Mon May 8 17:23:08 2006 UTC vs.
Revision 1.27 by root, Wed May 17 20:21:27 2006 UTC

… …
17 can_focus => 1, 17 can_focus => 1,
18 list => glGenList, 18 list => glGenList,
19 @_ 19 @_
20 ); 20 );
21 21
22 $self->add_command ("killpets", "kills all your summoned and charmed creates");
23
24 $self 22 $self
25} 23}
26 24
27sub DESTROY { 25sub DESTROY {
28 my $self = shift; 26 my $self = shift;
… …
80 $self->SUPER::update; 78 $self->SUPER::update;
81} 79}
82 80
83sub draw { 81sub draw {
84 my ($self) = @_; 82 my ($self) = @_;
83
84 return
85 unless $CFClient::UI::FOCUS == $self || !$::FAST;
85 86
86 if (delete $self->{need_update}) { 87 if (delete $self->{need_update}) {
87 glNewList $self->{list}; 88 glNewList $self->{list};
88 89
89 if ($::MAP) { 90 if ($::MAP) {
… …
182 183
183 return unless $::CONN; 184 return unless $::CONN;
184 185
185 my $mod = $ev->{mod}; 186 my $mod = $ev->{mod};
186 my $sym = $ev->{sym}; 187 my $sym = $ev->{sym};
188 my $uni = $ev->{unicode};
187 189
188 if ($sym == CFClient::SDLK_KP5) { 190 if ($sym == CFClient::SDLK_KP5) {
189 $::CONN->user_send ("stay fire"); 191 $::CONN->user_send ("stay fire");
190 } elsif ($sym == ord ",") { 192 } elsif ($uni == ord ",") {
191 $::CONN->user_send ("take"); 193 $::CONN->user_send ("take");
192 } elsif ($sym == ord "a") { 194 } elsif ($uni == ord "\t") {
193 $::CONN->user_send ("apply"); 195 $::CONN->user_send ("apply");
196 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") {
197 $::CONN->user_send ("rotateshoottype +");
198 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") {
199 $::CONN->user_send ("rotateshoottype -");
194 } elsif ($sym == ord "'") { 200 } elsif ($uni == ord "'") {
195 $self->emit ('activate_console'); 201 $self->emit ('activate_console');
196 } elsif ($sym == ord "/") { 202 } elsif ($uni == ord "/") {
197 $self->emit (activate_console => '/'); 203 $self->emit (activate_console => '/');
198 } elsif (exists $DIR{$sym}) { 204 } elsif (exists $DIR{$sym}) {
199 if ($mod & CFClient::KMOD_SHIFT) { 205 if ($mod & CFClient::KMOD_SHIFT) {
200 $self->{shft}++; 206 $self->{shft}++;
201 $::CONN->user_send ("fire $DIR{$sym}[0]"); 207 $::CONN->user_send ("fire $DIR{$sym}[0]");
… …
210 new CFClient::MapWidget::Command:: 216 new CFClient::MapWidget::Command::
211 command => $self->{command}, 217 command => $self->{command},
212 can_focus => 1, 218 can_focus => 1,
213 connect_execute => sub { 219 connect_execute => sub {
214 # todo: support callback instead of user_send 220 # todo: support callback instead of user_send
215 $::CONN->user_send ($_[1][1]); 221 $::CONN->user_send ($_[1]);
216 }, 222 },
217 connect_close => sub { 223 connect_close => sub {
218 (delete $self->{command_widget})->hide; 224 (delete $self->{command_widget})->hide;
219 $self->focus_in; 225 $self->focus_in;
220 }, 226 },
221 ; 227 ;
222 $self->{command_widget}->key_down ($ev); 228 $self->{command_widget}->key_down ($ev)
229 unless $ev->{unicode} == 20;
223 return unless $self->{command_widget}; 230 return unless $self->{command_widget};
224 $self->{command_widget}->show; 231 $self->{command_widget}->show;
225 $self->{command_widget}->focus_in; 232 $self->{command_widget}->focus_in;
226 } 233 }
227} 234}
… …
241} 248}
242 249
243sub add_command { 250sub add_command {
244 my ($self, $command, $tooltip, $widget, $cb) = @_; 251 my ($self, $command, $tooltip, $widget, $cb) = @_;
245 252
246 (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g; 253 (my $data = $command) =~ s/\\//g;
247 254
255 $tooltip =~ s/^\s+//;
256
257 $tooltip = "<big>$data</big>\n\n$tooltip";
258
259 $tooltip =~ s/\s+$//;
260
261 $self->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
262}
263
264sub clr_commands {
265 my ($self) = @_;
266
248 $self->{command} = [ 267 %{$self->{command}} = ();
249 [$abbrev, $command, $tooltip, $widget, $cb],
250 grep $_->[1] ne $command, @{ $self->{command} },
251 ];
252} 268}
253 269
254package CFClient::MapWidget::MapMap; 270package CFClient::MapWidget::MapMap;
255 271
256our @ISA = CFClient::UI::Base::; 272our @ISA = CFClient::UI::Base::;
… …
334 350
335use strict; 351use strict;
336 352
337use CFClient::OpenGL; 353use CFClient::OpenGL;
338 354
339our @ISA = CFClient::UI::VBox::; 355our @ISA = CFClient::UI::Frame::;
340 356
341sub new { 357sub new {
342 my $class = shift; 358 my $class = shift;
343 359
344 my $self = $class->SUPER::new ( 360 my $self = $class->SUPER::new (
361 bg => [0, 0, 0, 0.8],
345 @_, 362 @_,
346 children => [map 363 );
364
365 $self->add ($self->{vbox} = new CFClient::UI::VBox);
366
367 $self->{label} = [
368 map
347 CFClient::UI::Label->new ( 369 CFClient::UI::Label->new (
348 can_hover => 1, 370 can_hover => 1,
349 can_events => 1, 371 can_events => 1,
372 tooltip_width => 0.33,
350 fontsize => $_, 373 fontsize => $_,
351 ), 1, 1, 0.8, 0.8, 0.8, 0.8, 0.8 374 ), (0.8) x 16
375 ];
376
377 $self->{entry} = new CFClient::UI::Entry
378 connect_changed => sub {
379 $self->update_labels;
352 ], 380 };
381
382 $self->{vbox}->add (
383 $self->{entry},
384 @{$self->{label}},
353 ); 385 );
354 386
355 $self 387 $self
356} 388}
357 389
… …
360 392
361 $self->SUPER::size_allocate ($w, $h); 393 $self->SUPER::size_allocate ($w, $h);
362 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 394 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
363} 395}
364 396
365sub update_labels {
366 my ($self) = @_;
367
368 my $command = $self->{command};
369 my $search_abbrev = qr/^\Q$self->{search}/;
370 my $search_full = qr/\Q$self->{search}/;
371
372 my @found;
373
374 for (@$command) {
375 if ($_->[0] =~ $search_abbrev) {
376 push @found, [$_->[0], $_];
377 } elsif (2 < length $self->{search} and $_->[1] =~ $search_full) {
378 push @found, [$_->[1], $_];
379 }
380 }
381
382 @found = sort { $a->[0] cmp $b->[0] } @found;
383
384 $self->{children}[0]->set_text ("$self->{search}_");
385
386 for (0..5) {
387 $self->{children}[$_ + 1]->set_text ($found[$_] ? "$found[$_][0] ($found[$_][1][1])" : "");
388 $self->{children}[$_ + 1]{tooltip} = ($found[$_] ? $found[$_][1][2] : "");
389 }
390
391 $self->{select} = $found[0][1]
392 if @found;
393
394 if (@found > 6) {
395 $self->{children}[6]->set_text ("...");
396 }
397
398 $self->check_size;
399}
400
401sub key_down { 397sub key_down {
402 my ($self, $ev) = @_; 398 my ($self, $ev) = @_;
403 399
404 if ($ev->{sym} == 8) { 400 if ($ev->{sym} == 13) {
405 substr $self->{search}, -1, 1, "";
406 $self->update_labels;
407 } elsif ($ev->{sym} == 13) {
408 if (exists $self->{select}) { 401 if (exists $self->{select}) {
409 $self->emit (execute => $self->{select}); 402 $self->emit (execute => $self->{select});
410 $self->emit ("close"); 403 $self->emit ("close");
411 } 404 }
412 } elsif ($ev->{sym} == 27) { 405 } elsif ($ev->{sym} == 27) {
406 $self->{entry}->set_text ("");
413 $self->emit ("close"); 407 $self->emit ("close");
414 return; 408 return;
415 } elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) { 409 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
416 $self->{search} .= chr $ev->{unicode}; 410 ++$self->{select_offset}
411 if $self->{select_offset} < $#{ $self->{last_match} || [] };
417 $self->update_labels; 412 $self->update_labels;
413 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
414 --$self->{select_offset}
415 if $self->{select_offset};
416 $self->update_labels;
417 } else {
418 #$self->{entry}{force_alloc} = 1;
419 $self->{entry}->key_down ($ev);
418 } 420 }
421}
419 422
420 length $self->{search} 423sub update_labels {
424 my ($self) = @_;
425
426 my $text = $self->{entry}->get_text;
427
428 length $text
421 or $self->emit ("close"); 429 or return $self->emit ("close");
430
431 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
432
433 if ($cmd ne $self->{last_search}) {
434 my $regexp = do {
435 my ($beg, @chr) = split //, lc $cmd;
436
437 # the following regex is used to match our "completion entry"
438 # to an actual command - the parentheses match kind of "overhead"
439 # - the more characters the parentheses match, the less attractive
440 # is the match.
441 my $regexp = "^\Q$beg\E"
442 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
443 qr<$regexp>
444 };
445
446 my @match;
447 my @penalty;
448
449 for (keys %{$self->{command}}) {
450 if (@penalty = $_ =~ $regexp) {
451 push @match, [$_, length join "", map "::$_", grep defined, @penalty];
452 }
453 }
454
455 @match = map $self->{command}{$_->[0]},
456 sort {
457 $a->[1] <=> $b->[1]
458 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
459 } @match;
460
461 $self->{last_search} = $cmd;
462 $self->{last_match} = \@match;
463
464 $self->{select_offset} = 0;
465 }
466
467 my @labels = @{ $self->{label} };
468 my @matches = @{ $self->{last_match} || [] };
469
470 if ($self->{select_offset}) {
471 splice @matches, 0, $self->{select_offset}, ();
472
473 my $label = shift @labels;
474 $label->set_text ("...");
475 $label->set_tooltip ("Use Cursor-Up to view previous matches");
476 }
477
478 for my $label (@labels) {
479 $label->{fg} = [1, 1, 1, 1];
480 $label->{bg} = [0, 0, 0, 0];
481 }
482
483 if (@matches) {
484 $self->{select} = "$matches[0][0]$arg";
485
486 $labels[0]->{fg} = [0, 0, 0, 1];
487 $labels[0]->{bg} = [1, 1, 1, 0.8];
488 } else {
489 $self->{select} = "$cmd$arg";
490 }
491
492 for my $match (@matches) {
493 my $label = shift @labels;
494
495 if (@labels) {
496 $label->set_text ("$match->[0]$arg");
497 $label->set_tooltip ($match->[1]);
498 } else {
499 $label->set_text ("...");
500 $label->set_tooltip ("Use Cursor-Down to view more matches");
501 last;
502 }
503 }
504
505 for my $label (@labels) {
506 $label->set_text ("");
507 $label->set_tooltip ("");
508 }
509
510 $self->update;
511 ###
512}
513
514sub _draw {
515 my ($self) = @_;
516
517 # hack
518 local $CFClient::UI::FOCUS = $self->{entry};
519
520 $self->SUPER::_draw;
422} 521}
423 522
4241 5231

Diff Legend

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