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.34 by root, Tue May 23 21:14:41 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) {
… …
114 0.05, 0.13, 0.05, 115 0.05, 0.13, 0.05,
115 ); 116 );
116 glEnable GL_CONVOLUTION_2D; 117 glEnable GL_CONVOLUTION_2D;
117 } 118 }
118 119
120 # try to re-use the texture name: TODO improve texture class instead
121 my $prev_name = ((delete $self->{fow_texture}) || {})->{name};
122
119 $self->{fow_texture} = new CFClient::Texture 123 $self->{fow_texture} = new CFClient::Texture
120 w => $w, 124 w => $w,
121 h => $h, 125 h => $h,
122 data => $data, 126 data => $data,
127 name => $prev_name, # a bit hackish
123 internalformat => GL_ALPHA, 128 internalformat => GL_ALPHA,
124 format => GL_ALPHA; 129 format => GL_ALPHA;
125 130
126 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 131 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
127 132
128 glEnable GL_BLEND;
129 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
130 glEnable GL_TEXTURE_2D; 133 glEnable GL_TEXTURE_2D;
131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
132 135
133 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 136 glColor +($::CFG->{fow_intensity}) x 3, 0.8;
134 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32); 137 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32);
135 138
136 glDisable GL_TEXTURE_2D; 139 glDisable GL_TEXTURE_2D;
137 glDisable GL_BLEND;
138 } 140 }
139 141
140 glPopMatrix; 142 glPopMatrix;
141 } 143 }
142 144
… …
145 147
146 glPushMatrix; 148 glPushMatrix;
147 glCallList $self->{list}; 149 glCallList $self->{list};
148 glPopMatrix; 150 glPopMatrix;
149 151
152 # TNT2 emulates logops in software (or worse :)
150 if ($CFClient::UI::FOCUS != $self) { 153 if ($CFClient::UI::FOCUS == $self) {
151 glColor 64/255, 64/255, 64/255; 154 (delete $self->{out_of_focus})->destroy
152 glLogicOp GL_AND; 155 if $self->{out_of_focus};
153 glEnable GL_COLOR_LOGIC_OP; 156 } else {
157 glColor 0.4, 0.2, 0.2, 0.6;
158 glEnable GL_BLEND;
159 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
154 glBegin GL_QUADS; 160 glBegin GL_QUADS;
155 glVertex 0, 0; 161 glVertex 0, 0;
156 glVertex 0, $::HEIGHT; 162 glVertex 0, $::HEIGHT;
157 glVertex $::WIDTH, $::HEIGHT; 163 glVertex $::WIDTH, $::HEIGHT;
158 glVertex $::WIDTH, 0; 164 glVertex $::WIDTH, 0;
159 glEnd; 165 glEnd;
160 glDisable GL_COLOR_LOGIC_OP; 166 glDisable GL_BLEND;
167
168 $self->{out_of_focus} ||= do {
169 my $label = new CFClient::UI::Label
170 x => 0,
171 y => 0,
172 z => 1,
173 ellipsise => 0,
174 text => "map out of focus (click map to play)";
175
176 $label->show;
177 $label->update;
178
179 $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
180 $label->move (
181 ($::WIDTH - $label->{w}) * 0.5,
182 ($::HEIGHT - $label->{h}) * 0.5,
183 );
184 });
185
186 $label
187 };
161 } 188 }
162} 189}
163 190
164my %DIR = ( 191my %DIR = (
165 CFClient::SDLK_KP8, [1, "north"], 192 CFClient::SDLK_KP8, [1, "north"],
… …
182 209
183 return unless $::CONN; 210 return unless $::CONN;
184 211
185 my $mod = $ev->{mod}; 212 my $mod = $ev->{mod};
186 my $sym = $ev->{sym}; 213 my $sym = $ev->{sym};
214 my $uni = $ev->{unicode};
187 215
188 if ($sym == CFClient::SDLK_KP5) { 216 if ($sym == CFClient::SDLK_KP5) {
189 $::CONN->user_send ("stay fire"); 217 $::CONN->user_send ("stay fire");
190 } elsif ($sym == ord ",") { 218 } elsif ($uni == ord ",") {
191 $::CONN->user_send ("take"); 219 $::CONN->user_send ("take");
192 } elsif ($sym == ord "a") { 220 } elsif ($uni == ord "\t" or $uni == ord " ") {
193 $::CONN->user_send ("apply"); 221 $::CONN->user_send ("apply");
222 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") {
223 $::CONN->user_send ("rotateshoottype +");
224 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") {
225 $::CONN->user_send ("rotateshoottype -");
194 } elsif ($sym == ord "'") { 226 } elsif ($uni == ord "'") {
195 $self->emit ('activate_console'); 227 $self->emit ('activate_console');
196 } elsif ($sym == ord "/") { 228 } elsif ($uni == ord "/") {
197 $self->emit (activate_console => '/'); 229 $self->emit (activate_console => '/');
198 } elsif (exists $DIR{$sym}) { 230 } elsif (exists $DIR{$sym}) {
199 if ($mod & CFClient::KMOD_SHIFT) { 231 if ($mod & CFClient::KMOD_SHIFT) {
200 $self->{shft}++; 232 $self->{shft}++;
201 $::CONN->user_send ("fire $DIR{$sym}[0]"); 233 $::CONN->user_send ("fire $DIR{$sym}[0]");
… …
210 new CFClient::MapWidget::Command:: 242 new CFClient::MapWidget::Command::
211 command => $self->{command}, 243 command => $self->{command},
212 can_focus => 1, 244 can_focus => 1,
213 connect_execute => sub { 245 connect_execute => sub {
214 # todo: support callback instead of user_send 246 # todo: support callback instead of user_send
215 $::CONN->user_send ($_[1][1]); 247 $::CONN->user_send ($_[1]);
216 }, 248 },
217 connect_close => sub { 249 connect_close => sub {
218 (delete $self->{command_widget})->hide; 250 (delete $self->{command_widget})->hide;
219 $self->focus_in; 251 $self->focus_in;
220 }, 252 },
221 ; 253 ;
222 $self->{command_widget}->key_down ($ev); 254 $self->{command_widget}->key_down ($ev)
255 unless $ev->{unicode} == 20;
223 return unless $self->{command_widget}; 256 return unless $self->{command_widget};
224 $self->{command_widget}->show; 257 $self->{command_widget}->show;
225 $self->{command_widget}->focus_in; 258 $self->{command_widget}->focus_in;
226 } 259 }
227} 260}
… …
241} 274}
242 275
243sub add_command { 276sub add_command {
244 my ($self, $command, $tooltip, $widget, $cb) = @_; 277 my ($self, $command, $tooltip, $widget, $cb) = @_;
245 278
246 (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g; 279 (my $data = $command) =~ s/\\//g;
247 280
281 $tooltip =~ s/^\s+//;
282
283 $tooltip = "<big>$data</big>\n\n$tooltip";
284
285 $tooltip =~ s/\s+$//;
286
287 $self->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
288}
289
290sub clr_commands {
291 my ($self) = @_;
292
248 $self->{command} = [ 293 %{$self->{command}} = ();
249 [$abbrev, $command, $tooltip, $widget, $cb],
250 grep $_->[1] ne $command, @{ $self->{command} },
251 ];
252} 294}
253 295
254package CFClient::MapWidget::MapMap; 296package CFClient::MapWidget::MapMap;
255 297
256our @ISA = CFClient::UI::Base::; 298our @ISA = CFClient::UI::Base::;
… …
334 376
335use strict; 377use strict;
336 378
337use CFClient::OpenGL; 379use CFClient::OpenGL;
338 380
339our @ISA = CFClient::UI::VBox::; 381our @ISA = CFClient::UI::Frame::;
340 382
341sub new { 383sub new {
342 my $class = shift; 384 my $class = shift;
343 385
344 my $self = $class->SUPER::new ( 386 my $self = $class->SUPER::new (
387 bg => [0, 0, 0, 0.8],
345 @_, 388 @_,
346 children => [map 389 );
390
391 $self->add ($self->{vbox} = new CFClient::UI::VBox);
392
393 $self->{label} = [
394 map
347 CFClient::UI::Label->new ( 395 CFClient::UI::Label->new (
348 can_hover => 1, 396 can_hover => 1,
349 can_events => 1, 397 can_events => 1,
398 tooltip_width => 0.33,
350 fontsize => $_, 399 fontsize => $_,
351 ), 1, 1, 0.8, 0.8, 0.8, 0.8, 0.8 400 ), (0.8) x 16
401 ];
402
403 $self->{entry} = new CFClient::UI::Entry
404 connect_changed => sub {
405 $self->update_labels;
352 ], 406 };
407
408 $self->{vbox}->add (
409 $self->{entry},
410 @{$self->{label}},
353 ); 411 );
354 412
355 $self 413 $self
356} 414}
357 415
… …
360 418
361 $self->SUPER::size_allocate ($w, $h); 419 $self->SUPER::size_allocate ($w, $h);
362 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 420 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
363} 421}
364 422
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 { 423sub key_down {
402 my ($self, $ev) = @_; 424 my ($self, $ev) = @_;
403 425
404 if ($ev->{sym} == 8) { 426 if ($ev->{sym} == 13) {
405 substr $self->{search}, -1, 1, "";
406 $self->update_labels;
407 } elsif ($ev->{sym} == 13) {
408 if (exists $self->{select}) { 427 if (exists $self->{select}) {
409 $self->emit (execute => $self->{select}); 428 $self->emit (execute => $self->{select});
410 $self->emit ("close"); 429 $self->emit ("close");
411 } 430 }
412 } elsif ($ev->{sym} == 27) { 431 } elsif ($ev->{sym} == 27) {
432 $self->{entry}->set_text ("");
413 $self->emit ("close"); 433 $self->emit ("close");
414 return; 434 return;
415 } elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) { 435 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
416 $self->{search} .= chr $ev->{unicode}; 436 ++$self->{select_offset}
437 if $self->{select_offset} < $#{ $self->{last_match} || [] };
417 $self->update_labels; 438 $self->update_labels;
439 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
440 --$self->{select_offset}
441 if $self->{select_offset};
442 $self->update_labels;
443 } else {
444 #$self->{entry}{force_alloc} = 1;
445 $self->{entry}->key_down ($ev);
418 } 446 }
447}
419 448
420 length $self->{search} 449sub update_labels {
450 my ($self) = @_;
451
452 my $text = $self->{entry}->get_text;
453
454 length $text
421 or $self->emit ("close"); 455 or return $self->emit ("close");
456
457 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
458
459 if ($cmd ne $self->{last_search}) {
460 my $regexp = do {
461 my ($beg, @chr) = split //, lc $cmd;
462
463 # the following regex is used to match our "completion entry"
464 # to an actual command - the parentheses match kind of "overhead"
465 # - the more characters the parentheses match, the less attractive
466 # is the match.
467 my $regexp = "^\Q$beg\E"
468 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
469 qr<$regexp>
470 };
471
472 my @match;
473 my @penalty;
474
475 for (keys %{$self->{command}}) {
476 if (@penalty = $_ =~ $regexp) {
477 push @match, [$_, length join "", map "::$_", grep defined, @penalty];
478 }
479 }
480
481 @match = map $self->{command}{$_->[0]},
482 sort {
483 $a->[1] <=> $b->[1]
484 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
485 or (length $a->[0]) <=> (length $b->[0])
486 } @match;
487
488 $self->{last_search} = $cmd;
489 $self->{last_match} = \@match;
490
491 $self->{select_offset} = 0;
492 }
493
494 my @labels = @{ $self->{label} };
495 my @matches = @{ $self->{last_match} || [] };
496
497 if ($self->{select_offset}) {
498 splice @matches, 0, $self->{select_offset}, ();
499
500 my $label = shift @labels;
501 $label->set_text ("...");
502 $label->set_tooltip ("Use Cursor-Up to view previous matches");
503 }
504
505 for my $label (@labels) {
506 $label->{fg} = [1, 1, 1, 1];
507 $label->{bg} = [0, 0, 0, 0];
508 }
509
510 if (@matches) {
511 $self->{select} = "$matches[0][0]$arg";
512
513 $labels[0]->{fg} = [0, 0, 0, 1];
514 $labels[0]->{bg} = [1, 1, 1, 0.8];
515 } else {
516 $self->{select} = "$cmd$arg";
517 }
518
519 for my $match (@matches) {
520 my $label = shift @labels;
521
522 if (@labels) {
523 $label->set_text ("$match->[0]$arg");
524 $label->set_tooltip ($match->[1]);
525 } else {
526 $label->set_text ("...");
527 $label->set_tooltip ("Use Cursor-Down to view more matches");
528 last;
529 }
530 }
531
532 for my $label (@labels) {
533 $label->set_text ("");
534 $label->set_tooltip ("");
535 }
536
537 $self->update;
538 ###
539}
540
541sub _draw {
542 my ($self) = @_;
543
544 # hack
545 local $CFClient::UI::FOCUS = $self->{entry};
546
547 $self->SUPER::_draw;
422} 548}
423 549
4241 5501

Diff Legend

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