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.20 by root, Tue Apr 25 14:04:37 2006 UTC vs.
Revision 1.44 by root, Tue May 30 07:13:08 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"); 22 $self->{completer} = new CFClient::MapWidget::Command::
23 command => $self->{command},
24 can_focus => 1,
25 tooltip => "<b>The Command Completer</b>\n\n"
26 . "This is your central interface to send text commands to the server. "
27 . "To enter a verbatim command to send to the server, just type the command, "
28 . "followed by a space, and press return. "
29 . "Typing the initial letters of words (or just any letters) displays guesses "
30 . "for commands you might want to use.\n"
31 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
32 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.",
33 ;
23 34
24 $self 35 $self
25} 36}
26 37
27sub DESTROY { 38sub add_command {
39 my ($self, $command, $tooltip, $widget, $cb) = @_;
40
41 (my $data = $command) =~ s/\\//g;
42
43 $tooltip =~ s/^\s+//;
44 $tooltip = "<big>$data</big>\n\n$tooltip";
45 $tooltip =~ s/\s+$//;
46
47 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
48}
49
50sub clr_commands {
28 my $self = shift; 51 my ($self) = @_;
29 52
30 glDeleteList $self->{list}; 53 %{$self->{completer}{command}} = ();
31
32 $self->SUPER::DESTROY;
33} 54}
34 55
35sub button_down { 56sub button_down {
36 my ($self, $ev, $x, $y) = @_; 57 my ($self, $ev, $x, $y) = @_;
37 58
… …
78 99
79 $self->{need_update} = 1; 100 $self->{need_update} = 1;
80 $self->SUPER::update; 101 $self->SUPER::update;
81} 102}
82 103
104my %DIR = (
105 CFClient::SDLK_KP8, [1, "north"],
106 CFClient::SDLK_KP9, [2, "northeast"],
107 CFClient::SDLK_KP6, [3, "east"],
108 CFClient::SDLK_KP3, [4, "southeast"],
109 CFClient::SDLK_KP2, [5, "south"],
110 CFClient::SDLK_KP1, [6, "southwest"],
111 CFClient::SDLK_KP4, [7, "west"],
112 CFClient::SDLK_KP7, [8, "northwest"],
113
114 CFClient::SDLK_UP, [1, "north"],
115 CFClient::SDLK_RIGHT, [3, "east"],
116 CFClient::SDLK_DOWN, [5, "south"],
117 CFClient::SDLK_LEFT, [7, "west"],
118);
119
120sub key_down {
121 my ($self, $ev) = @_;
122
123 return unless $::CONN;
124
125 my $mod = $ev->{mod};
126 my $sym = $ev->{sym};
127 my $uni = $ev->{unicode};
128
129 if ($sym == CFClient::SDLK_KP5) {
130 $::CONN->user_send ("stay fire");
131 } elsif ($uni == ord ",") {
132 $::CONN->user_send ("take");
133 } elsif ($uni == ord " ") {
134 $::CONN->user_send ("apply");
135 } elsif ($uni == ord ".") {
136 $::CONN->user_send ($self->{completer}{last_command})
137 if exists $self->{completer}{last_command};
138 } elsif ($uni == ord "\t") {
139 $::INV_WINDOW->toggle_visibility;
140 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") {
141 $::CONN->user_send ("rotateshoottype +");
142 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") {
143 $::CONN->user_send ("rotateshoottype -");
144 } elsif ($uni == ord '"') {
145 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
146 $self->{completer}->show;
147 } elsif ($uni == ord "'") {
148 $self->{completer}->set_prefix ("");
149 $self->{completer}->show;
150 } elsif (exists $DIR{$sym}) {
151 if ($mod & CFClient::KMOD_SHIFT) {
152 $self->{shft}++;
153 $::CONN->user_send ("fire $DIR{$sym}[0]");
154 } elsif ($mod & CFClient::KMOD_CTRL) {
155 $self->{ctrl}++;
156 $::CONN->user_send ("run $DIR{$sym}[0]");
157 } else {
158 $::CONN->user_send ("$DIR{$sym}[1]");
159 }
160 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
161 CFClient::Recorder::start (1);
162 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
163 CFClient::Recorder::stop (1);
164 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
165 $::CONN->user_send ($_) for @$bind_cmd;
166 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
167 $self->{completer}->key_down ($ev);
168 $self->{completer}->show;
169 }
170}
171
172sub key_up {
173 my ($self, $ev) = @_;
174
175 my $mod = $ev->{mod};
176 my $sym = $ev->{sym};
177
178 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
179 $::CONN->user_send ("fire_stop");
180 }
181 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
182 $::CONN->user_send ("run_stop");
183 }
184}
185
83sub draw { 186sub draw {
84 my ($self) = @_; 187 my ($self) = @_;
188
189 my $focused = $CFClient::UI::FOCUS == $self
190 || $CFClient::UI::FOCUS == $self->{completer}{entry};
191
192 return
193 unless $focused || !$::FAST;
85 194
86 if (delete $self->{need_update}) { 195 if (delete $self->{need_update}) {
87 glNewList $self->{list}; 196 glNewList $self->{list};
88 197
89 if ($::MAP) { 198 if ($::MAP) {
… …
99 glTranslate $sx0 - 32, $sy0 - 32, 0; 208 glTranslate $sx0 - 32, $sy0 - 32, 0;
100 209
101 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 210 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
102 211
103 if ($::CFG->{fow_enable}) { 212 if ($::CFG->{fow_enable}) {
104 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war 213 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
105 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 214 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
106 glConvolutionFilter2D ( 215 glConvolutionFilter2D (
107 GL_CONVOLUTION_2D, 216 GL_CONVOLUTION_2D,
108 GL_ALPHA, 217 GL_ALPHA,
109 3, 3, 218 3, 3,
… …
114 0.05, 0.13, 0.05, 223 0.05, 0.13, 0.05,
115 ); 224 );
116 glEnable GL_CONVOLUTION_2D; 225 glEnable GL_CONVOLUTION_2D;
117 } 226 }
118 227
228 $self->{fow_texture_name} ||= glGenTexture;
229 # try to re-use the texture name: TODO improve texture class instead
230
119 $self->{fow_texture} = new CFClient::Texture 231 $self->{fow_texture} = new CFClient::Texture
120 w => $w, 232 w => $w,
121 h => $h, 233 h => $h,
122 data => $data, 234 data => $data,
235 name => $self->{fow_texture_name},
123 internalformat => GL_ALPHA, 236 internalformat => GL_ALPHA,
124 format => GL_ALPHA; 237 format => GL_ALPHA;
125 238
126 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 239 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
127 240
128 glEnable GL_BLEND;
129 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
130 glEnable GL_TEXTURE_2D; 241 glEnable GL_TEXTURE_2D;
131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 242 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
132 243
133 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 244 glColor +($::CFG->{fow_intensity}) x 3, 0.8;
134 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32); 245 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32);
135 246
136 glDisable GL_TEXTURE_2D; 247 glDisable GL_TEXTURE_2D;
137 glDisable GL_BLEND;
138 } 248 }
139 249
140 glPopMatrix; 250 glPopMatrix;
141 } 251 }
142 252
… …
145 255
146 glPushMatrix; 256 glPushMatrix;
147 glCallList $self->{list}; 257 glCallList $self->{list};
148 glPopMatrix; 258 glPopMatrix;
149 259
150 if ($CFClient::UI::FOCUS != $self) { 260 # TNT2 emulates logops in software (or worse :)
151 glColor 64/255, 64/255, 64/255; 261 if ($focused) {
152 glLogicOp GL_AND; 262 (delete $self->{out_of_focus})->destroy
153 glEnable GL_COLOR_LOGIC_OP; 263 if $self->{out_of_focus};
264 } else {
265 glColor 0.4, 0.2, 0.2, 0.6;
266 glEnable GL_BLEND;
267 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
154 glBegin GL_QUADS; 268 glBegin GL_QUADS;
155 glVertex 0, 0; 269 glVertex 0, 0;
156 glVertex 0, $::HEIGHT; 270 glVertex 0, $::HEIGHT;
157 glVertex $::WIDTH, $::HEIGHT; 271 glVertex $::WIDTH, $::HEIGHT;
158 glVertex $::WIDTH, 0; 272 glVertex $::WIDTH, 0;
159 glEnd; 273 glEnd;
160 glDisable GL_COLOR_LOGIC_OP; 274 glDisable GL_BLEND;
161 }
162}
163 275
164my %DIR = ( 276# $self->{out_of_focus} ||= do {
165 CFClient::SDLK_KP8, [1, "north"], 277# my $label = new CFClient::UI::Label
166 CFClient::SDLK_KP9, [2, "northeast"], 278# x => 0,
167 CFClient::SDLK_KP6, [3, "east"], 279# y => 0,
168 CFClient::SDLK_KP3, [4, "southeast"], 280# z => 1,
169 CFClient::SDLK_KP2, [5, "south"], 281# ellipsise => 0,
170 CFClient::SDLK_KP1, [6, "southwest"], 282# text => "map out of focus (click map to play)";
171 CFClient::SDLK_KP4, [7, "west"], 283#
172 CFClient::SDLK_KP7, [8, "northwest"], 284# $label->show;
173 285# $label->update;
174 CFClient::SDLK_UP, [1, "north"], 286#
175 CFClient::SDLK_RIGHT, [3, "east"], 287# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
176 CFClient::SDLK_DOWN, [5, "south"], 288# $label->move_abs (
177 CFClient::SDLK_LEFT, [7, "west"], 289# ($::WIDTH - $label->{w}) * 0.5,
178); 290# ($::HEIGHT - $label->{h}) * 0.5,
179 291# );
180sub key_down { 292# });
181 my ($self, $ev) = @_; 293#
182 294# $label
183 my $mod = $ev->{mod};
184 my $sym = $ev->{sym};
185
186 if ($sym == CFClient::SDLK_KP5) {
187 $::CONN->user_send ("stay fire");
188 } elsif ($sym == ord ",") {
189 $::CONN->user_send ("take");
190 } elsif ($sym == ord "a") {
191 $::CONN->user_send ("apply");
192 } elsif ($sym == ord "'") {
193 $self->emit ('activate_console');
194 } elsif ($sym == ord "/") {
195 $self->emit (activate_console => '/');
196 } elsif (exists $DIR{$sym}) {
197 if ($mod & CFClient::KMOD_SHIFT) {
198 $self->{shft}++;
199 $::CONN->user_send ("fire $DIR{$sym}[0]");
200 } elsif ($mod & CFClient::KMOD_CTRL) {
201 $self->{ctrl}++;
202 $::CONN->user_send ("run $DIR{$sym}[0]");
203 } else {
204 $::CONN->user_send ("$DIR{$sym}[1]");
205 } 295# };
206 } elsif ($ev->{unicode}) {
207 $self->{command_widget} ||=
208 new CFClient::MapWidget::Command::
209 command => $self->{command},
210 can_focus => 1,
211 connect_execute => sub {
212 # todo: support callback instead of user_send
213 $::CONN->user_send ($_[1][1]);
214 },
215 connect_close => sub {
216 (delete $self->{command_widget})->hide;
217 $self->focus_in;
218 },
219 ;
220 $self->{command_widget}->key_down ($ev);
221 return unless $self->{command_widget};
222 $self->{command_widget}->show;
223 $self->{command_widget}->focus_in;
224 } 296 }
225} 297}
226 298
227sub key_up { 299sub DESTROY {
228 my ($self, $ev) = @_; 300 my $self = shift;
229 301
230 my $mod = $ev->{mod}; 302 glDeleteList $self->{list};
231 my $sym = $ev->{sym};
232 303
233 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 304 $self->SUPER::DESTROY;
234 $::CONN->user_send ("fire_stop");
235 }
236 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
237 $::CONN->user_send ("run_stop");
238 }
239}
240
241sub add_command {
242 my ($self, $command, $tooltip, $widget, $cb) = @_;
243
244 (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;
245
246 $self->{command} = [
247 [$abbrev, $command, $tooltip, $widget, $cb],
248 grep $_->[1] ne $command, @{ $self->{command} },
249 ];
250} 305}
251 306
252package CFClient::MapWidget::MapMap; 307package CFClient::MapWidget::MapMap;
253 308
254our @ISA = CFClient::UI::Base::; 309our @ISA = CFClient::UI::Base::;
… …
332 387
333use strict; 388use strict;
334 389
335use CFClient::OpenGL; 390use CFClient::OpenGL;
336 391
337our @ISA = CFClient::UI::VBox::; 392our @ISA = CFClient::UI::Frame::;
338 393
339sub new { 394sub new {
340 my $class = shift; 395 my $class = shift;
341 396
342 my $self = $class->SUPER::new ( 397 my $self = $class->SUPER::new (
398 bg => [0, 0, 0, 0.8],
343 @_, 399 @_,
344 children => [map 400 );
401
402 $self->add ($self->{vbox} = new CFClient::UI::VBox);
403
404 $self->{label} = [
405 map
345 CFClient::UI::Label->new ( 406 CFClient::UI::Label->new (
346 can_hover => 1, 407 can_hover => 1,
347 can_events => 1, 408 can_events => 1,
409 tooltip_width => 0.33,
348 fontsize => $_, 410 fontsize => $_,
349 ), 1, 1, 0.8, 0.8, 0.8, 0.8, 0.8 411 ), (0.8) x 16
412 ];
413
414 $self->{entry} = new CFClient::UI::Entry
415 on_changed => sub {
416 $self->update_labels;
350 ], 417 },
418 on_key_down => sub {
419 my ($entry, $ev) = @_;
420
421 my $self = $entry->{parent}{parent};
422
423 if ($ev->{sym} == 13) {
424 if (exists $self->{select}) {
425 $self->{last_command} = $self->{select};
426 $::CONN->user_send ($self->{select});
427 $self->hide;
428 }
429 } elsif ($ev->{sym} == 27) {
430 $self->hide;
431 return;
432 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
433 ++$self->{select_offset}
434 if $self->{select_offset} < $#{ $self->{last_match} || [] };
435 $self->update_labels;
436 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
437 --$self->{select_offset}
438 if $self->{select_offset};
439 $self->update_labels;
440 } else {
441 return 0;
442 }
443
444 1
445 }
446 ;
447
448 $self->{vbox}->add (
449 $self->{entry},
450 @{$self->{label}},
351 ); 451 );
352 452
353 $self 453 $self
454}
455
456sub set_prefix {
457 my ($self, $prefix) = @_;
458
459 $self->{entry}->set_text ($prefix);
460 $self->show;
354} 461}
355 462
356sub size_allocate { 463sub size_allocate {
357 my ($self, $w, $h) = @_; 464 my ($self, $w, $h) = @_;
358 465
359 $self->SUPER::size_allocate ($w, $h); 466 $self->SUPER::size_allocate ($w, $h);
360 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 467 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
361} 468}
362 469
363sub update_labels { 470sub show {
364 my ($self) = @_; 471 my ($self) = @_;
365 472
366 my $command = $self->{command}; 473 $self->SUPER::show;
367 my $search_abbrev = qr/^\Q$self->{search}/; 474 $self->{entry}->focus_in;
368 my $search_full = qr/\Q$self->{search}/; 475}
369 476
370 my @found; 477sub hide {
478 my ($self) = @_;
371 479
372 for (@$command) { 480 $self->SUPER::hide;
373 if ($_->[0] =~ $search_abbrev) {
374 push @found, [$_->[0], $_];
375 } elsif (2 < length $self->{search} and $_->[1] =~ $search_full) {
376 push @found, [$_->[1], $_];
377 }
378 }
379
380 @found = sort { $a->[0] cmp $b->[0] } @found;
381
382 $self->{children}[0]->set_text ("$self->{search}_");
383
384 for (0..5) {
385 $self->{children}[$_ + 1]->set_text ($found[$_] ? "$found[$_][0] ($found[$_][1][1])" : "");
386 $self->{children}[$_ + 1]{tooltip} = ($found[$_] ? $found[$_][1][2] : "");
387 }
388
389 $self->{select} = $found[0][1]
390 if @found;
391
392 if (@found > 6) {
393 $self->{children}[6]->set_text ("..."); 481 $self->{entry}->set_text ("");
394 }
395
396 $self->check_size;
397} 482}
398 483
399sub key_down { 484sub key_down {
400 my ($self, $ev) = @_; 485 my ($self, $ev) = @_;
401 486
402 if ($ev->{sym} == 8) { 487 $self->{entry}->key_down ($ev);
403 substr $self->{search}, -1, 1, ""; 488}
404 $self->update_labels; 489
405 } elsif ($ev->{sym} == 13) { 490sub update_labels {
406 if (exists $self->{select}) { 491 my ($self) = @_;
407 $self->emit (execute => $self->{select}); 492
408 $self->emit ("close"); 493 my $text = $self->{entry}->get_text;
494
495 length $text
496 or return $self->hide;
497
498 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
499
500 if ($text ne $self->{last_search}) {
501 my @match;
502
503 if ($text =~ /^(.*?)\s+$/) {
504 @match = [$cmd, "(appended whitespace suppresses completion)"];
505 } else {
506 my $regexp = do {
507 my ($beg, @chr) = split //, lc $cmd;
508
509 # the following regex is used to match our "completion entry"
510 # to an actual command - the parentheses match kind of "overhead"
511 # - the more characters the parentheses match, the less attractive
512 # is the match.
513 my $regexp = "^\Q$beg\E"
514 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
515 qr<$regexp>
516 };
517
518 my @penalty;
519
520 for (keys %{$self->{command}}) {
521 if (@penalty = $_ =~ $regexp) {
522 push @match, [$_, length join "", map "::$_", grep defined, @penalty];
523 }
524 }
525
526 @match = map $self->{command}{$_->[0]},
527 sort {
528 $a->[1] <=> $b->[1]
529 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
530 or (length $b->[0]) <=> (length $a->[0])
531 } @match;
409 } 532 }
410 } elsif ($ev->{sym} == 27) { 533
411 $self->emit ("close"); 534 $self->{last_search} = $text;
412 return; 535 $self->{last_match} = \@match;
413 } elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) { 536
414 $self->{search} .= chr $ev->{unicode}; 537 $self->{select_offset} = 0;
538 }
539
540 my @labels = @{ $self->{label} };
541 my @matches = @{ $self->{last_match} || [] };
542
543 if ($self->{select_offset}) {
544 splice @matches, 0, $self->{select_offset}, ();
545
546 my $label = shift @labels;
547 $label->set_text ("...");
548 $label->set_tooltip ("Use Cursor-Up to view previous matches");
549 }
550
551 for my $label (@labels) {
552 $label->{fg} = [1, 1, 1, 1];
553 $label->{bg} = [0, 0, 0, 0];
554 }
555
556 if (@matches) {
557 $self->{select} = "$matches[0][0]$arg";
558
559 $labels[0]->{fg} = [0, 0, 0, 1];
560 $labels[0]->{bg} = [1, 1, 1, 0.8];
561 } else {
562 $self->{select} = "$cmd$arg";
563 }
564
565 for my $match (@matches) {
566 my $label = shift @labels;
567
568 if (@labels) {
569 $label->set_text ("$match->[0]$arg");
570 $label->set_tooltip ($match->[1]);
571 } else {
572 $label->set_text ("...");
573 $label->set_tooltip ("Use Cursor-Down to view more matches");
574 last;
575 }
576 }
577
578 for my $label (@labels) {
579 $label->set_text ("");
580 $label->set_tooltip ("");
581 }
582
415 $self->update_labels; 583 $self->update;
416 } 584 ###
585}
417 586
418 length $self->{search} 587sub _draw {
419 or $self->emit ("close"); 588 my ($self) = @_;
589
590 # hack
591 local $CFClient::UI::FOCUS = $self->{entry};
592
593 $self->SUPER::_draw;
420} 594}
421 595
4221 5961

Diff Legend

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