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

Diff Legend

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