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

Diff Legend

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