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.19 by root, Tue Apr 25 13:51:48 2006 UTC vs.
Revision 1.29 by root, Thu May 18 16:42:26 2006 UTC

… …
10our @ISA = CFClient::UI::Base::; 10our @ISA = CFClient::UI::Base::;
11 11
12sub new { 12sub new {
13 my $class = shift; 13 my $class = shift;
14 14
15 $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 @_ 19 @_
20 ) 20 );
21
22 $self
21} 23}
22 24
23sub DESTROY { 25sub DESTROY {
24 my $self = shift; 26 my $self = shift;
25 27
… …
76 $self->SUPER::update; 78 $self->SUPER::update;
77} 79}
78 80
79sub draw { 81sub draw {
80 my ($self) = @_; 82 my ($self) = @_;
83
84 return
85 unless $CFClient::UI::FOCUS == $self || !$::FAST;
81 86
82 if (delete $self->{need_update}) { 87 if (delete $self->{need_update}) {
83 glNewList $self->{list}; 88 glNewList $self->{list};
84 89
85 if ($::MAP) { 90 if ($::MAP) {
… …
141 146
142 glPushMatrix; 147 glPushMatrix;
143 glCallList $self->{list}; 148 glCallList $self->{list};
144 glPopMatrix; 149 glPopMatrix;
145 150
151 # TNT2 emulates logops in software (or worse :)
146 if ($CFClient::UI::FOCUS != $self) { 152 if ($CFClient::UI::FOCUS != $self) {
147 glColor 64/255, 64/255, 64/255; 153 glColor 0.4, 0.2, 0.2, 0.9;
148 glLogicOp GL_AND; 154 glEnable GL_BLEND;
149 glEnable GL_COLOR_LOGIC_OP; 155 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
150 glBegin GL_QUADS; 156 glBegin GL_QUADS;
151 glVertex 0, 0; 157 glVertex 0, 0;
152 glVertex 0, $::HEIGHT; 158 glVertex 0, $::HEIGHT;
153 glVertex $::WIDTH, $::HEIGHT; 159 glVertex $::WIDTH, $::HEIGHT;
154 glVertex $::WIDTH, 0; 160 glVertex $::WIDTH, 0;
155 glEnd; 161 glEnd;
156 glDisable GL_COLOR_LOGIC_OP; 162 glDisable GL_BLEND;
157 } 163 }
158} 164}
159 165
160my %DIR = ( 166my %DIR = (
161 CFClient::SDLK_KP8, [1, "north"], 167 CFClient::SDLK_KP8, [1, "north"],
… …
174); 180);
175 181
176sub key_down { 182sub key_down {
177 my ($self, $ev) = @_; 183 my ($self, $ev) = @_;
178 184
185 return unless $::CONN;
186
179 my $mod = $ev->{mod}; 187 my $mod = $ev->{mod};
180 my $sym = $ev->{sym}; 188 my $sym = $ev->{sym};
189 my $uni = $ev->{unicode};
181 190
182 if ($sym == CFClient::SDLK_KP5) { 191 if ($sym == CFClient::SDLK_KP5) {
183 $::CONN->user_send ("stay fire"); 192 $::CONN->user_send ("stay fire");
184 } elsif ($sym == ord ",") { 193 } elsif ($uni == ord ",") {
185 $::CONN->user_send ("take"); 194 $::CONN->user_send ("take");
186 } elsif ($sym == ord "a") { 195 } elsif ($uni == ord "\t" or $uni == ord " ") {
187 $::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 -");
188 } elsif ($sym == ord "'") { 201 } elsif ($uni == ord "'") {
189 $self->emit ('activate_console'); 202 $self->emit ('activate_console');
190 } elsif ($sym == ord "/") { 203 } elsif ($uni == ord "/") {
191 $self->emit (activate_console => '/'); 204 $self->emit (activate_console => '/');
192 } elsif (exists $DIR{$sym}) { 205 } elsif (exists $DIR{$sym}) {
193 if ($mod & CFClient::KMOD_SHIFT) { 206 if ($mod & CFClient::KMOD_SHIFT) {
194 $self->{shft}++; 207 $self->{shft}++;
195 $::CONN->user_send ("fire $DIR{$sym}[0]"); 208 $::CONN->user_send ("fire $DIR{$sym}[0]");
… …
204 new CFClient::MapWidget::Command:: 217 new CFClient::MapWidget::Command::
205 command => $self->{command}, 218 command => $self->{command},
206 can_focus => 1, 219 can_focus => 1,
207 connect_execute => sub { 220 connect_execute => sub {
208 # todo: support callback instead of user_send 221 # todo: support callback instead of user_send
209 $::CONN->user_send ($_[1][1]); 222 $::CONN->user_send ($_[1]);
210 }, 223 },
211 connect_close => sub { 224 connect_close => sub {
212 (delete $self->{command_widget})->hide; 225 (delete $self->{command_widget})->hide;
213 $self->focus_in; 226 $self->focus_in;
214 }, 227 },
215 ; 228 ;
216 $self->{command_widget}->key_down ($ev); 229 $self->{command_widget}->key_down ($ev)
230 unless $ev->{unicode} == 20;
217 return unless $self->{command_widget}; 231 return unless $self->{command_widget};
218 $self->{command_widget}->show; 232 $self->{command_widget}->show;
219 $self->{command_widget}->focus_in; 233 $self->{command_widget}->focus_in;
220 } 234 }
221} 235}
… …
235} 249}
236 250
237sub add_command { 251sub add_command {
238 my ($self, $command, $tooltip, $widget, $cb) = @_; 252 my ($self, $command, $tooltip, $widget, $cb) = @_;
239 253
240 (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g; 254 (my $data = $command) =~ s/\\//g;
241 255
242 push @{$self->{command}}, [$abbrev, $command, $tooltip, $widget, $cb]; 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
268 %{$self->{command}} = ();
243} 269}
244 270
245package CFClient::MapWidget::MapMap; 271package CFClient::MapWidget::MapMap;
246 272
247our @ISA = CFClient::UI::Base::; 273our @ISA = CFClient::UI::Base::;
… …
325 351
326use strict; 352use strict;
327 353
328use CFClient::OpenGL; 354use CFClient::OpenGL;
329 355
330our @ISA = CFClient::UI::VBox::; 356our @ISA = CFClient::UI::Frame::;
331 357
332sub new { 358sub new {
333 my $class = shift; 359 my $class = shift;
334 360
335 my $self = $class->SUPER::new ( 361 my $self = $class->SUPER::new (
362 bg => [0, 0, 0, 0.8],
336 @_, 363 @_,
337 children => [map 364 );
365
366 $self->add ($self->{vbox} = new CFClient::UI::VBox);
367
368 $self->{label} = [
369 map
338 CFClient::UI::Label->new ( 370 CFClient::UI::Label->new (
339 can_hover => 1, 371 can_hover => 1,
340 can_events => 1, 372 can_events => 1,
373 tooltip_width => 0.33,
341 fontsize => $_, 374 fontsize => $_,
342 ), 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;
343 ], 381 };
382
383 $self->{vbox}->add (
384 $self->{entry},
385 @{$self->{label}},
344 ); 386 );
345 387
346 $self 388 $self
347} 389}
348 390
… …
351 393
352 $self->SUPER::size_allocate ($w, $h); 394 $self->SUPER::size_allocate ($w, $h);
353 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 395 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
354} 396}
355 397
356sub update_labels {
357 my ($self) = @_;
358
359 my $command = $self->{command};
360 my $search_abbrev = qr/^\Q$self->{search}/;
361 my $search_full = qr/\Q$self->{search}/;
362
363 my @found;
364
365 for (@$command) {
366 if ($_->[0] =~ $search_abbrev) {
367 push @found, [$_->[0], $_];
368 } elsif ($_->[1] =~ $search_full) {
369 push @found, [$_->[1], $_];
370 }
371 }
372
373 @found = sort { $a->[0] cmp $b->[0] } @found;
374
375 $self->{children}[0]->set_text ("$self->{search}_");
376
377 for (0..5) {
378 $self->{children}[$_ + 1]->set_text ($found[$_] ? "$found[$_][0] ($found[$_][1][1])" : "");
379 $self->{children}[$_ + 1]{tooltip} = ($found[$_] ? $found[$_][1][2] : "");
380 }
381
382 $self->{select} = $found[0][1]
383 if @found;
384
385 if (@found > 6) {
386 $self->{children}[6]->set_text ("...");
387 }
388
389 $self->check_size;
390}
391
392sub key_down { 398sub key_down {
393 my ($self, $ev) = @_; 399 my ($self, $ev) = @_;
394 400
395 if ($ev->{sym} == 8) { 401 if ($ev->{sym} == 13) {
396 substr $self->{search}, -1, 1, "";
397 $self->update_labels;
398 } elsif ($ev->{sym} == 13) {
399 if (exists $self->{select}) { 402 if (exists $self->{select}) {
400 $self->emit (execute => $self->{select}); 403 $self->emit (execute => $self->{select});
401 $self->emit ("close"); 404 $self->emit ("close");
402 } 405 }
403 } elsif ($ev->{sym} == 27) { 406 } elsif ($ev->{sym} == 27) {
407 $self->{entry}->set_text ("");
404 $self->emit ("close"); 408 $self->emit ("close");
405 return; 409 return;
406 } elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) { 410 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
407 $self->{search} .= chr $ev->{unicode}; 411 ++$self->{select_offset}
412 if $self->{select_offset} < $#{ $self->{last_match} || [] };
408 $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);
409 } 421 }
422}
410 423
411 length $self->{search} 424sub update_labels {
425 my ($self) = @_;
426
427 my $text = $self->{entry}->get_text;
428
429 length $text
412 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;
413} 522}
414 523
4151 5241

Diff Legend

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