… | |
… | |
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 | |
27 | sub DESTROY { |
25 | sub DESTROY { |
28 | my $self = shift; |
26 | my $self = shift; |
… | |
… | |
80 | $self->SUPER::update; |
78 | $self->SUPER::update; |
81 | } |
79 | } |
82 | |
80 | |
83 | sub draw { |
81 | sub 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 | glColor 0.4, 0.2, 0.2, 0.9; |
152 | glLogicOp GL_AND; |
155 | glEnable GL_BLEND; |
153 | glEnable GL_COLOR_LOGIC_OP; |
156 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
154 | glBegin GL_QUADS; |
157 | glBegin GL_QUADS; |
155 | glVertex 0, 0; |
158 | glVertex 0, 0; |
156 | glVertex 0, $::HEIGHT; |
159 | glVertex 0, $::HEIGHT; |
157 | glVertex $::WIDTH, $::HEIGHT; |
160 | glVertex $::WIDTH, $::HEIGHT; |
158 | glVertex $::WIDTH, 0; |
161 | glVertex $::WIDTH, 0; |
159 | glEnd; |
162 | glEnd; |
160 | glDisable GL_COLOR_LOGIC_OP; |
163 | glDisable GL_BLEND; |
161 | } |
164 | } |
162 | } |
165 | } |
163 | |
166 | |
164 | my %DIR = ( |
167 | my %DIR = ( |
165 | CFClient::SDLK_KP8, [1, "north"], |
168 | CFClient::SDLK_KP8, [1, "north"], |
… | |
… | |
182 | |
185 | |
183 | return unless $::CONN; |
186 | return unless $::CONN; |
184 | |
187 | |
185 | my $mod = $ev->{mod}; |
188 | my $mod = $ev->{mod}; |
186 | my $sym = $ev->{sym}; |
189 | my $sym = $ev->{sym}; |
|
|
190 | my $uni = $ev->{unicode}; |
187 | |
191 | |
188 | if ($sym == CFClient::SDLK_KP5) { |
192 | if ($sym == CFClient::SDLK_KP5) { |
189 | $::CONN->user_send ("stay fire"); |
193 | $::CONN->user_send ("stay fire"); |
190 | } elsif ($sym == ord ",") { |
194 | } elsif ($uni == ord ",") { |
191 | $::CONN->user_send ("take"); |
195 | $::CONN->user_send ("take"); |
192 | } elsif ($sym == ord "a") { |
196 | } elsif ($uni == ord "\t" or $uni == ord " ") { |
193 | $::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 -"); |
194 | } elsif ($sym == ord "'") { |
202 | } elsif ($uni == ord "'") { |
195 | $self->emit ('activate_console'); |
203 | $self->emit ('activate_console'); |
196 | } elsif ($sym == ord "/") { |
204 | } elsif ($uni == ord "/") { |
197 | $self->emit (activate_console => '/'); |
205 | $self->emit (activate_console => '/'); |
198 | } elsif (exists $DIR{$sym}) { |
206 | } elsif (exists $DIR{$sym}) { |
199 | if ($mod & CFClient::KMOD_SHIFT) { |
207 | if ($mod & CFClient::KMOD_SHIFT) { |
200 | $self->{shft}++; |
208 | $self->{shft}++; |
201 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
209 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
… | |
… | |
210 | new CFClient::MapWidget::Command:: |
218 | new CFClient::MapWidget::Command:: |
211 | command => $self->{command}, |
219 | command => $self->{command}, |
212 | can_focus => 1, |
220 | can_focus => 1, |
213 | connect_execute => sub { |
221 | connect_execute => sub { |
214 | # todo: support callback instead of user_send |
222 | # todo: support callback instead of user_send |
215 | $::CONN->user_send ($_[1][1]); |
223 | $::CONN->user_send ($_[1]); |
216 | }, |
224 | }, |
217 | connect_close => sub { |
225 | connect_close => sub { |
218 | (delete $self->{command_widget})->hide; |
226 | (delete $self->{command_widget})->hide; |
219 | $self->focus_in; |
227 | $self->focus_in; |
220 | }, |
228 | }, |
221 | ; |
229 | ; |
222 | $self->{command_widget}->key_down ($ev); |
230 | $self->{command_widget}->key_down ($ev) |
|
|
231 | unless $ev->{unicode} == 20; |
223 | return unless $self->{command_widget}; |
232 | return unless $self->{command_widget}; |
224 | $self->{command_widget}->show; |
233 | $self->{command_widget}->show; |
225 | $self->{command_widget}->focus_in; |
234 | $self->{command_widget}->focus_in; |
226 | } |
235 | } |
227 | } |
236 | } |
… | |
… | |
241 | } |
250 | } |
242 | |
251 | |
243 | sub add_command { |
252 | sub add_command { |
244 | my ($self, $command, $tooltip, $widget, $cb) = @_; |
253 | my ($self, $command, $tooltip, $widget, $cb) = @_; |
245 | |
254 | |
246 | (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g; |
255 | (my $data = $command) =~ s/\\//g; |
247 | |
256 | |
|
|
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 | |
|
|
266 | sub clr_commands { |
|
|
267 | my ($self) = @_; |
|
|
268 | |
248 | $self->{command} = [ |
269 | %{$self->{command}} = (); |
249 | [$abbrev, $command, $tooltip, $widget, $cb], |
|
|
250 | grep $_->[1] ne $command, @{ $self->{command} }, |
|
|
251 | ]; |
|
|
252 | } |
270 | } |
253 | |
271 | |
254 | package CFClient::MapWidget::MapMap; |
272 | package CFClient::MapWidget::MapMap; |
255 | |
273 | |
256 | our @ISA = CFClient::UI::Base::; |
274 | our @ISA = CFClient::UI::Base::; |
… | |
… | |
334 | |
352 | |
335 | use strict; |
353 | use strict; |
336 | |
354 | |
337 | use CFClient::OpenGL; |
355 | use CFClient::OpenGL; |
338 | |
356 | |
339 | our @ISA = CFClient::UI::VBox::; |
357 | our @ISA = CFClient::UI::Frame::; |
340 | |
358 | |
341 | sub new { |
359 | sub new { |
342 | my $class = shift; |
360 | my $class = shift; |
343 | |
361 | |
344 | my $self = $class->SUPER::new ( |
362 | my $self = $class->SUPER::new ( |
|
|
363 | bg => [0, 0, 0, 0.8], |
345 | @_, |
364 | @_, |
346 | children => [map |
365 | ); |
|
|
366 | |
|
|
367 | $self->add ($self->{vbox} = new CFClient::UI::VBox); |
|
|
368 | |
|
|
369 | $self->{label} = [ |
|
|
370 | map |
347 | CFClient::UI::Label->new ( |
371 | CFClient::UI::Label->new ( |
348 | can_hover => 1, |
372 | can_hover => 1, |
349 | can_events => 1, |
373 | can_events => 1, |
|
|
374 | tooltip_width => 0.33, |
350 | fontsize => $_, |
375 | fontsize => $_, |
351 | ), 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; |
352 | ], |
382 | }; |
|
|
383 | |
|
|
384 | $self->{vbox}->add ( |
|
|
385 | $self->{entry}, |
|
|
386 | @{$self->{label}}, |
353 | ); |
387 | ); |
354 | |
388 | |
355 | $self |
389 | $self |
356 | } |
390 | } |
357 | |
391 | |
… | |
… | |
360 | |
394 | |
361 | $self->SUPER::size_allocate ($w, $h); |
395 | $self->SUPER::size_allocate ($w, $h); |
362 | $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); |
396 | $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); |
363 | } |
397 | } |
364 | |
398 | |
365 | sub 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 | |
|
|
401 | sub key_down { |
399 | sub key_down { |
402 | my ($self, $ev) = @_; |
400 | my ($self, $ev) = @_; |
403 | |
401 | |
404 | if ($ev->{sym} == 8) { |
402 | if ($ev->{sym} == 13) { |
405 | substr $self->{search}, -1, 1, ""; |
|
|
406 | $self->update_labels; |
|
|
407 | } elsif ($ev->{sym} == 13) { |
|
|
408 | if (exists $self->{select}) { |
403 | if (exists $self->{select}) { |
409 | $self->emit (execute => $self->{select}); |
404 | $self->emit (execute => $self->{select}); |
410 | $self->emit ("close"); |
405 | $self->emit ("close"); |
411 | } |
406 | } |
412 | } elsif ($ev->{sym} == 27) { |
407 | } elsif ($ev->{sym} == 27) { |
|
|
408 | $self->{entry}->set_text (""); |
413 | $self->emit ("close"); |
409 | $self->emit ("close"); |
414 | return; |
410 | return; |
415 | } elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) { |
411 | } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { |
416 | $self->{search} .= chr $ev->{unicode}; |
412 | ++$self->{select_offset} |
|
|
413 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
417 | $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); |
418 | } |
422 | } |
|
|
423 | } |
419 | |
424 | |
420 | length $self->{search} |
425 | sub update_labels { |
|
|
426 | my ($self) = @_; |
|
|
427 | |
|
|
428 | my $text = $self->{entry}->get_text; |
|
|
429 | |
|
|
430 | length $text |
421 | 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 | |
|
|
516 | sub _draw { |
|
|
517 | my ($self) = @_; |
|
|
518 | |
|
|
519 | # hack |
|
|
520 | local $CFClient::UI::FOCUS = $self->{entry}; |
|
|
521 | |
|
|
522 | $self->SUPER::_draw; |
422 | } |
523 | } |
423 | |
524 | |
424 | 1 |
525 | 1 |