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.22 by root, Sat May 13 00:27:08 2006 UTC vs.
Revision 1.29 by root, Thu May 18 16:42:26 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) {
… …
145 146
146 glPushMatrix; 147 glPushMatrix;
147 glCallList $self->{list}; 148 glCallList $self->{list};
148 glPopMatrix; 149 glPopMatrix;
149 150
151 # TNT2 emulates logops in software (or worse :)
150 if ($CFClient::UI::FOCUS != $self) { 152 if ($CFClient::UI::FOCUS != $self) {
151 glColor 64/255, 64/255, 64/255; 153 glColor 0.4, 0.2, 0.2, 0.9;
152 glLogicOp GL_AND; 154 glEnable GL_BLEND;
153 glEnable GL_COLOR_LOGIC_OP; 155 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
154 glBegin GL_QUADS; 156 glBegin GL_QUADS;
155 glVertex 0, 0; 157 glVertex 0, 0;
156 glVertex 0, $::HEIGHT; 158 glVertex 0, $::HEIGHT;
157 glVertex $::WIDTH, $::HEIGHT; 159 glVertex $::WIDTH, $::HEIGHT;
158 glVertex $::WIDTH, 0; 160 glVertex $::WIDTH, 0;
159 glEnd; 161 glEnd;
160 glDisable GL_COLOR_LOGIC_OP; 162 glDisable GL_BLEND;
161 } 163 }
162} 164}
163 165
164my %DIR = ( 166my %DIR = (
165 CFClient::SDLK_KP8, [1, "north"], 167 CFClient::SDLK_KP8, [1, "north"],
… …
188 190
189 if ($sym == CFClient::SDLK_KP5) { 191 if ($sym == CFClient::SDLK_KP5) {
190 $::CONN->user_send ("stay fire"); 192 $::CONN->user_send ("stay fire");
191 } elsif ($uni == ord ",") { 193 } elsif ($uni == ord ",") {
192 $::CONN->user_send ("take"); 194 $::CONN->user_send ("take");
193 } elsif ($uni == ord "a") { 195 } elsif ($uni == ord "\t" or $uni == ord " ") {
194 $::CONN->user_send ("apply"); 196 $::CONN->user_send ("apply");
197 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") {
198 $::CONN->user_send ("rotateshoottype +");
199 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") {
200 $::CONN->user_send ("rotateshoottype -");
195 } elsif ($uni == ord "'") { 201 } elsif ($uni == ord "'") {
196 $self->emit ('activate_console'); 202 $self->emit ('activate_console');
197 } elsif ($uni == ord "/") { 203 } elsif ($uni == ord "/") {
198 $self->emit (activate_console => '/'); 204 $self->emit (activate_console => '/');
199 } elsif (exists $DIR{$sym}) { 205 } elsif (exists $DIR{$sym}) {
… …
211 new CFClient::MapWidget::Command:: 217 new CFClient::MapWidget::Command::
212 command => $self->{command}, 218 command => $self->{command},
213 can_focus => 1, 219 can_focus => 1,
214 connect_execute => sub { 220 connect_execute => sub {
215 # todo: support callback instead of user_send 221 # todo: support callback instead of user_send
216 $::CONN->user_send ($_[1][1]); 222 $::CONN->user_send ($_[1]);
217 }, 223 },
218 connect_close => sub { 224 connect_close => sub {
219 (delete $self->{command_widget})->hide; 225 (delete $self->{command_widget})->hide;
220 $self->focus_in; 226 $self->focus_in;
221 }, 227 },
222 ; 228 ;
223 $self->{command_widget}->key_down ($ev); 229 $self->{command_widget}->key_down ($ev)
230 unless $ev->{unicode} == 20;
224 return unless $self->{command_widget}; 231 return unless $self->{command_widget};
225 $self->{command_widget}->show; 232 $self->{command_widget}->show;
226 $self->{command_widget}->focus_in; 233 $self->{command_widget}->focus_in;
227 } 234 }
228} 235}
… …
242} 249}
243 250
244sub add_command { 251sub add_command {
245 my ($self, $command, $tooltip, $widget, $cb) = @_; 252 my ($self, $command, $tooltip, $widget, $cb) = @_;
246 253
247 (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g; 254 (my $data = $command) =~ s/\\//g;
248 255
256 $tooltip =~ s/^\s+//;
257
258 $tooltip = "<big>$data</big>\n\n$tooltip";
259
260 $tooltip =~ s/\s+$//;
261
262 $self->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
263}
264
265sub clr_commands {
266 my ($self) = @_;
267
249 $self->{command} = [ 268 %{$self->{command}} = ();
250 [$abbrev, $command, $tooltip, $widget, $cb],
251 grep $_->[1] ne $command, @{ $self->{command} },
252 ];
253} 269}
254 270
255package CFClient::MapWidget::MapMap; 271package CFClient::MapWidget::MapMap;
256 272
257our @ISA = CFClient::UI::Base::; 273our @ISA = CFClient::UI::Base::;
… …
335 351
336use strict; 352use strict;
337 353
338use CFClient::OpenGL; 354use CFClient::OpenGL;
339 355
340our @ISA = CFClient::UI::VBox::; 356our @ISA = CFClient::UI::Frame::;
341 357
342sub new { 358sub new {
343 my $class = shift; 359 my $class = shift;
344 360
345 my $self = $class->SUPER::new ( 361 my $self = $class->SUPER::new (
362 bg => [0, 0, 0, 0.8],
346 @_, 363 @_,
347 children => [map 364 );
365
366 $self->add ($self->{vbox} = new CFClient::UI::VBox);
367
368 $self->{label} = [
369 map
348 CFClient::UI::Label->new ( 370 CFClient::UI::Label->new (
349 can_hover => 1, 371 can_hover => 1,
350 can_events => 1, 372 can_events => 1,
373 tooltip_width => 0.33,
351 fontsize => $_, 374 fontsize => $_,
352 ), 1, 1, 0.8, 0.8, 0.8, 0.8, 0.8 375 ), (0.8) x 16
376 ];
377
378 $self->{entry} = new CFClient::UI::Entry
379 connect_changed => sub {
380 $self->update_labels;
353 ], 381 };
382
383 $self->{vbox}->add (
384 $self->{entry},
385 @{$self->{label}},
354 ); 386 );
355 387
356 $self 388 $self
357} 389}
358 390
… …
361 393
362 $self->SUPER::size_allocate ($w, $h); 394 $self->SUPER::size_allocate ($w, $h);
363 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 395 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
364} 396}
365 397
366sub update_labels {
367 my ($self) = @_;
368
369 my $command = $self->{command};
370 my $search_abbrev = qr/^\Q$self->{search}/;
371 my $search_full = qr/\Q$self->{search}/;
372
373 my @found;
374
375 for (@$command) {
376 if ($_->[0] =~ $search_abbrev) {
377 push @found, [$_->[0], $_];
378 } elsif (2 < length $self->{search} and $_->[1] =~ $search_full) {
379 push @found, [$_->[1], $_];
380 }
381 }
382
383 @found = sort { $a->[0] cmp $b->[0] } @found;
384
385 $self->{children}[0]->set_text ("$self->{search}_");
386
387 for (0..5) {
388 $self->{children}[$_ + 1]->set_text ($found[$_] ? "$found[$_][0] ($found[$_][1][1])" : "");
389 $self->{children}[$_ + 1]{tooltip} = ($found[$_] ? $found[$_][1][2] : "");
390 }
391
392 $self->{select} = $found[0][1]
393 if @found;
394
395 if (@found > 6) {
396 $self->{children}[6]->set_text ("...");
397 }
398
399 $self->check_size;
400}
401
402sub key_down { 398sub key_down {
403 my ($self, $ev) = @_; 399 my ($self, $ev) = @_;
404 400
405 if ($ev->{sym} == 8) { 401 if ($ev->{sym} == 13) {
406 substr $self->{search}, -1, 1, "";
407 $self->update_labels;
408 } elsif ($ev->{sym} == 13) {
409 if (exists $self->{select}) { 402 if (exists $self->{select}) {
410 $self->emit (execute => $self->{select}); 403 $self->emit (execute => $self->{select});
411 $self->emit ("close"); 404 $self->emit ("close");
412 } 405 }
413 } elsif ($ev->{sym} == 27) { 406 } elsif ($ev->{sym} == 27) {
407 $self->{entry}->set_text ("");
414 $self->emit ("close"); 408 $self->emit ("close");
415 return; 409 return;
416 } elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) { 410 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
417 $self->{search} .= chr $ev->{unicode}; 411 ++$self->{select_offset}
412 if $self->{select_offset} < $#{ $self->{last_match} || [] };
418 $self->update_labels; 413 $self->update_labels;
414 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
415 --$self->{select_offset}
416 if $self->{select_offset};
417 $self->update_labels;
418 } else {
419 #$self->{entry}{force_alloc} = 1;
420 $self->{entry}->key_down ($ev);
419 } 421 }
422}
420 423
421 length $self->{search} 424sub update_labels {
425 my ($self) = @_;
426
427 my $text = $self->{entry}->get_text;
428
429 length $text
422 or $self->emit ("close"); 430 or return $self->emit ("close");
431
432 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
433
434 if ($cmd ne $self->{last_search}) {
435 my $regexp = do {
436 my ($beg, @chr) = split //, lc $cmd;
437
438 # the following regex is used to match our "completion entry"
439 # to an actual command - the parentheses match kind of "overhead"
440 # - the more characters the parentheses match, the less attractive
441 # is the match.
442 my $regexp = "^\Q$beg\E"
443 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
444 qr<$regexp>
445 };
446
447 my @match;
448 my @penalty;
449
450 for (keys %{$self->{command}}) {
451 if (@penalty = $_ =~ $regexp) {
452 push @match, [$_, length join "", map "::$_", grep defined, @penalty];
453 }
454 }
455
456 @match = map $self->{command}{$_->[0]},
457 sort {
458 $a->[1] <=> $b->[1]
459 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
460 } @match;
461
462 $self->{last_search} = $cmd;
463 $self->{last_match} = \@match;
464
465 $self->{select_offset} = 0;
466 }
467
468 my @labels = @{ $self->{label} };
469 my @matches = @{ $self->{last_match} || [] };
470
471 if ($self->{select_offset}) {
472 splice @matches, 0, $self->{select_offset}, ();
473
474 my $label = shift @labels;
475 $label->set_text ("...");
476 $label->set_tooltip ("Use Cursor-Up to view previous matches");
477 }
478
479 for my $label (@labels) {
480 $label->{fg} = [1, 1, 1, 1];
481 $label->{bg} = [0, 0, 0, 0];
482 }
483
484 if (@matches) {
485 $self->{select} = "$matches[0][0]$arg";
486
487 $labels[0]->{fg} = [0, 0, 0, 1];
488 $labels[0]->{bg} = [1, 1, 1, 0.8];
489 } else {
490 $self->{select} = "$cmd$arg";
491 }
492
493 for my $match (@matches) {
494 my $label = shift @labels;
495
496 if (@labels) {
497 $label->set_text ("$match->[0]$arg");
498 $label->set_tooltip ($match->[1]);
499 } else {
500 $label->set_text ("...");
501 $label->set_tooltip ("Use Cursor-Down to view more matches");
502 last;
503 }
504 }
505
506 for my $label (@labels) {
507 $label->set_text ("");
508 $label->set_tooltip ("");
509 }
510
511 $self->update;
512 ###
513}
514
515sub _draw {
516 my ($self) = @_;
517
518 # hack
519 local $CFClient::UI::FOCUS = $self->{entry};
520
521 $self->SUPER::_draw;
423} 522}
424 523
4251 5241

Diff Legend

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