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

Diff Legend

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