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

Diff Legend

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