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.16 by root, Mon Apr 24 13:04:31 2006 UTC vs.
Revision 1.34 by root, Tue May 23 21:14:41 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 $self
21} 23}
22 24
23sub DESTROY { 25sub DESTROY {
24 my $self = shift; 26 my $self = shift;
25 27
… …
77} 79}
78 80
79sub draw { 81sub draw {
80 my ($self) = @_; 82 my ($self) = @_;
81 83
84 return
85 unless $CFClient::UI::FOCUS == $self || !$::FAST;
86
82 if (delete $self->{need_update}) { 87 if (delete $self->{need_update}) {
83 glNewList $self->{list}; 88 glNewList $self->{list};
84 89
85 if ($::MAP) { 90 if ($::MAP) {
86 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}); 91 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
87 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}); 92 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
93
94 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
95 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
88 96
89 glPushMatrix; 97 glPushMatrix;
90 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 98 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
91
92 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
93 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
94 99
95 glTranslate $sx0 - 32, $sy0 - 32, 0; 100 glTranslate $sx0 - 32, $sy0 - 32, 0;
96 101
97 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 102 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
98 103
… …
110 0.05, 0.13, 0.05, 115 0.05, 0.13, 0.05,
111 ); 116 );
112 glEnable GL_CONVOLUTION_2D; 117 glEnable GL_CONVOLUTION_2D;
113 } 118 }
114 119
120 # try to re-use the texture name: TODO improve texture class instead
121 my $prev_name = ((delete $self->{fow_texture}) || {})->{name};
122
115 $self->{fow_texture} = new CFClient::Texture 123 $self->{fow_texture} = new CFClient::Texture
116 w => $w, 124 w => $w,
117 h => $h, 125 h => $h,
118 data => $data, 126 data => $data,
127 name => $prev_name, # a bit hackish
119 internalformat => GL_ALPHA, 128 internalformat => GL_ALPHA,
120 format => GL_ALPHA; 129 format => GL_ALPHA;
121 130
122 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 131 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
123 132
124 glEnable GL_BLEND;
125 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
126 glEnable GL_TEXTURE_2D; 133 glEnable GL_TEXTURE_2D;
127 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
128 135
129 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 136 glColor +($::CFG->{fow_intensity}) x 3, 0.8;
130 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32); 137 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32);
131 138
132 glDisable GL_TEXTURE_2D; 139 glDisable GL_TEXTURE_2D;
133 glDisable GL_BLEND;
134 } 140 }
135 141
136 # HACK BEGIN
137 {
138 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
139
140 glTranslate 0, 30;
141 my ($w, $h) = (250, 250);
142
143 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
144
145 glEnable GL_BLEND;
146 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
147 glEnable GL_TEXTURE_2D;
148 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
149
150 glPopMatrix; 142 glPopMatrix;
151
152 $self->{mapmap_texture} =
153 new CFClient::Texture
154 w => $w,
155 h => $h,
156 data => $::MAP->mapmap (- $w * 0.5, - $h * 0.5, $w, $h),
157 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
158
159 $self->{mapmap_texture}->draw_quad (0, 0);
160
161 glDisable GL_TEXTURE_2D;
162
163 glTranslate 0.375, 0.375;
164
165 glColor 1, 1, 0, 1;
166 glBegin GL_LINE_LOOP;
167 glVertex $w * 0.5 - $sx , $h * 0.5 - $sy ;
168 glVertex $w * 0.5 - $sx , $h * 0.5 - $sy + $sh;
169 glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy + $sh;
170 glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy ;
171 glEnd;
172
173 glDisable GL_BLEND;
174 }
175 # HACK END
176 } 143 }
177 144
178 glEndList; 145 glEndList;
179 } 146 }
180 147
181 glPushMatrix; 148 glPushMatrix;
182 glCallList $self->{list}; 149 glCallList $self->{list};
183 glPopMatrix; 150 glPopMatrix;
184 151
152 # TNT2 emulates logops in software (or worse :)
185 if ($CFClient::UI::FOCUS != $self) { 153 if ($CFClient::UI::FOCUS == $self) {
186 glColor 64/255, 64/255, 64/255; 154 (delete $self->{out_of_focus})->destroy
187 glLogicOp GL_AND; 155 if $self->{out_of_focus};
188 glEnable GL_COLOR_LOGIC_OP; 156 } else {
157 glColor 0.4, 0.2, 0.2, 0.6;
158 glEnable GL_BLEND;
159 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
189 glBegin GL_QUADS; 160 glBegin GL_QUADS;
190 glVertex 0, 0; 161 glVertex 0, 0;
191 glVertex 0, $::HEIGHT; 162 glVertex 0, $::HEIGHT;
192 glVertex $::WIDTH, $::HEIGHT; 163 glVertex $::WIDTH, $::HEIGHT;
193 glVertex $::WIDTH, 0; 164 glVertex $::WIDTH, 0;
194 glEnd; 165 glEnd;
195 glDisable GL_COLOR_LOGIC_OP; 166 glDisable GL_BLEND;
167
168 $self->{out_of_focus} ||= do {
169 my $label = new CFClient::UI::Label
170 x => 0,
171 y => 0,
172 z => 1,
173 ellipsise => 0,
174 text => "map out of focus (click map to play)";
175
176 $label->show;
177 $label->update;
178
179 $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
180 $label->move (
181 ($::WIDTH - $label->{w}) * 0.5,
182 ($::HEIGHT - $label->{h}) * 0.5,
183 );
184 });
185
186 $label
187 };
196 } 188 }
197} 189}
198 190
199my %DIR = ( 191my %DIR = (
200 CFClient::SDLK_KP8, [1, "north"], 192 CFClient::SDLK_KP8, [1, "north"],
… …
213); 205);
214 206
215sub key_down { 207sub key_down {
216 my ($self, $ev) = @_; 208 my ($self, $ev) = @_;
217 209
210 return unless $::CONN;
211
218 my $mod = $ev->{mod}; 212 my $mod = $ev->{mod};
219 my $sym = $ev->{sym}; 213 my $sym = $ev->{sym};
214 my $uni = $ev->{unicode};
220 215
221 if ($sym == CFClient::SDLK_KP5) { 216 if ($sym == CFClient::SDLK_KP5) {
222 $::CONN->user_send ("stay fire"); 217 $::CONN->user_send ("stay fire");
223 } elsif ($sym == ord ",") { 218 } elsif ($uni == ord ",") {
224 $::CONN->user_send ("take"); 219 $::CONN->user_send ("take");
225 } elsif ($sym == ord "a") { 220 } elsif ($uni == ord "\t" or $uni == ord " ") {
226 $::CONN->user_send ("apply"); 221 $::CONN->user_send ("apply");
222 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") {
223 $::CONN->user_send ("rotateshoottype +");
224 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") {
225 $::CONN->user_send ("rotateshoottype -");
227 } elsif ($sym == ord "'") { 226 } elsif ($uni == ord "'") {
228 $self->emit ('activate_console'); 227 $self->emit ('activate_console');
229 } elsif ($sym == ord "/") { 228 } elsif ($uni == ord "/") {
230 $self->emit (activate_console => '/'); 229 $self->emit (activate_console => '/');
231 } elsif (exists $DIR{$sym}) { 230 } elsif (exists $DIR{$sym}) {
232 if ($mod & CFClient::KMOD_SHIFT) { 231 if ($mod & CFClient::KMOD_SHIFT) {
233 $self->{shft}++; 232 $self->{shft}++;
234 $::CONN->user_send ("fire $DIR{$sym}[0]"); 233 $::CONN->user_send ("fire $DIR{$sym}[0]");
… …
243 new CFClient::MapWidget::Command:: 242 new CFClient::MapWidget::Command::
244 command => $self->{command}, 243 command => $self->{command},
245 can_focus => 1, 244 can_focus => 1,
246 connect_execute => sub { 245 connect_execute => sub {
247 # todo: support callback instead of user_send 246 # todo: support callback instead of user_send
248 $::CONN->user_send ($_[1][1]); 247 $::CONN->user_send ($_[1]);
249 }, 248 },
250 connect_close => sub { 249 connect_close => sub {
251 (delete $self->{command_widget})->hide; 250 (delete $self->{command_widget})->hide;
252 $self->focus_in; 251 $self->focus_in;
253 }, 252 },
254 ; 253 ;
255 $self->{command_widget}->key_down ($ev); 254 $self->{command_widget}->key_down ($ev)
255 unless $ev->{unicode} == 20;
256 return unless $self->{command_widget}; 256 return unless $self->{command_widget};
257 $self->{command_widget}->show; 257 $self->{command_widget}->show;
258 $self->{command_widget}->focus_in; 258 $self->{command_widget}->focus_in;
259 } 259 }
260} 260}
… …
274} 274}
275 275
276sub add_command { 276sub add_command {
277 my ($self, $command, $tooltip, $widget, $cb) = @_; 277 my ($self, $command, $tooltip, $widget, $cb) = @_;
278 278
279 (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g; 279 (my $data = $command) =~ s/\\//g;
280 280
281 push @{$self->{command}}, [$abbrev, $command, $tooltip, $widget, $cb]; 281 $tooltip =~ s/^\s+//;
282
283 $tooltip = "<big>$data</big>\n\n$tooltip";
284
285 $tooltip =~ s/\s+$//;
286
287 $self->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
288}
289
290sub clr_commands {
291 my ($self) = @_;
292
293 %{$self->{command}} = ();
294}
295
296package CFClient::MapWidget::MapMap;
297
298our @ISA = CFClient::UI::Base::;
299
300use Time::HiRes qw(time);
301use CFClient::OpenGL;
302
303sub size_request {
304 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
305}
306
307sub size_allocate {
308 my ($self, $w, $h) = @_;
309
310 $self->SUPER::size_allocate ($w, $h);
311 $self->update;
312}
313
314sub update {
315 my ($self) = @_;
316
317 delete $self->{texture_atime};
318 $self->SUPER::update;
319}
320
321sub _draw {
322 my ($self) = @_;
323
324 $::MAP or return;
325
326 my ($w, $h) = @$self{qw(w h)};
327
328 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
329 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
330
331 my $sx = int $::CFG->{map_shift_x} / 32;
332 my $sy = int $::CFG->{map_shift_y} / 32;
333
334 my $ox = 0.5 * ($w - $sw);
335 my $oy = 0.5 * ($h - $sh);
336
337 glEnable GL_BLEND;
338 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
339 glEnable GL_TEXTURE_2D;
340 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
341
342 if ($self->{texture_atime} < time) {
343 $self->{texture_atime} = time + 1/3;
344
345 $self->{texture} =
346 new CFClient::Texture
347 w => $w,
348 h => $h,
349 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
350 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
351 }
352
353 $self->{texture}->draw_quad (0, 0);
354
355 glDisable GL_TEXTURE_2D;
356
357 glTranslate 0.375, 0.375;
358
359 #TODO: map scale is completely borked
360
361 my $x0 = int $ox - $sx + 0.5;
362 my $y0 = int $oy - $sy + 0.5;
363
364 glColor 1, 1, 0, 1;
365 glBegin GL_LINE_LOOP;
366 glVertex $x0 , $y0 ;
367 glVertex $x0 , $y0 + $sh;
368 glVertex $x0 + $sw, $y0 + $sh;
369 glVertex $x0 + $sw, $y0 ;
370 glEnd;
371
372 glDisable GL_BLEND;
282} 373}
283 374
284package CFClient::MapWidget::Command; 375package CFClient::MapWidget::Command;
285 376
286use strict; 377use strict;
287 378
288use CFClient::OpenGL; 379use CFClient::OpenGL;
289 380
290our @ISA = CFClient::UI::VBox::; 381our @ISA = CFClient::UI::Frame::;
291 382
292sub new { 383sub new {
293 my $class = shift; 384 my $class = shift;
294 385
295 my $self = $class->SUPER::new ( 386 my $self = $class->SUPER::new (
387 bg => [0, 0, 0, 0.8],
296 @_, 388 @_,
297 children => [map 389 );
390
391 $self->add ($self->{vbox} = new CFClient::UI::VBox);
392
393 $self->{label} = [
394 map
298 CFClient::UI::Label->new ( 395 CFClient::UI::Label->new (
299 can_hover => 1, 396 can_hover => 1,
300 can_events => 1, 397 can_events => 1,
398 tooltip_width => 0.33,
301 fontsize => $_, 399 fontsize => $_,
302 ), 1, 1, 0.8, 0.8, 0.8, 0.8, 0.8 400 ), (0.8) x 16
401 ];
402
403 $self->{entry} = new CFClient::UI::Entry
404 connect_changed => sub {
405 $self->update_labels;
303 ], 406 };
407
408 $self->{vbox}->add (
409 $self->{entry},
410 @{$self->{label}},
304 ); 411 );
305 412
306 $self 413 $self
307} 414}
308 415
… …
311 418
312 $self->SUPER::size_allocate ($w, $h); 419 $self->SUPER::size_allocate ($w, $h);
313 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 420 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
314} 421}
315 422
316sub update_labels {
317 my ($self) = @_;
318
319 my $command = $self->{command};
320 my $search_abbrev = qr/^\Q$self->{search}/;
321 my $search_full = qr/\Q$self->{search}/;
322
323 my @found;
324
325 for (@$command) {
326 if ($_->[0] =~ $search_abbrev) {
327 push @found, [$_->[0], $_];
328 } elsif ($_->[1] =~ $search_full) {
329 push @found, [$_->[1], $_];
330 }
331 }
332
333 @found = sort { $a->[0] cmp $b->[0] } @found;
334
335 $self->{children}[0]->set_text ("$self->{search}_");
336
337 for (0..5) {
338 $self->{children}[$_ + 1]->set_text ($found[$_] ? "$found[$_][0] ($found[$_][1][1])" : "");
339 $self->{children}[$_ + 1]{tooltip} = ($found[$_] ? $found[$_][1][2] : "");
340 }
341
342 $self->{select} = $found[0][1]
343 if @found;
344
345 if (@found > 6) {
346 $self->{children}[6]->set_text ("...");
347 }
348
349 $self->check_size;
350}
351
352sub key_down { 423sub key_down {
353 my ($self, $ev) = @_; 424 my ($self, $ev) = @_;
354 425
355 if ($ev->{sym} == 8) { 426 if ($ev->{sym} == 13) {
356 substr $self->{search}, -1, 1, "";
357 $self->update_labels;
358 } elsif ($ev->{sym} == 13) {
359 if (exists $self->{select}) { 427 if (exists $self->{select}) {
360 $self->emit (execute => $self->{select}); 428 $self->emit (execute => $self->{select});
361 $self->emit ("close"); 429 $self->emit ("close");
362 } 430 }
363 } elsif ($ev->{sym} == 27) { 431 } elsif ($ev->{sym} == 27) {
432 $self->{entry}->set_text ("");
364 $self->emit ("close"); 433 $self->emit ("close");
365 return; 434 return;
366 } elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) { 435 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
367 $self->{search} .= chr $ev->{unicode}; 436 ++$self->{select_offset}
437 if $self->{select_offset} < $#{ $self->{last_match} || [] };
368 $self->update_labels; 438 $self->update_labels;
439 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
440 --$self->{select_offset}
441 if $self->{select_offset};
442 $self->update_labels;
443 } else {
444 #$self->{entry}{force_alloc} = 1;
445 $self->{entry}->key_down ($ev);
369 } 446 }
447}
370 448
371 length $self->{search} 449sub update_labels {
450 my ($self) = @_;
451
452 my $text = $self->{entry}->get_text;
453
454 length $text
372 or $self->emit ("close"); 455 or return $self->emit ("close");
456
457 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
458
459 if ($cmd ne $self->{last_search}) {
460 my $regexp = do {
461 my ($beg, @chr) = split //, lc $cmd;
462
463 # the following regex is used to match our "completion entry"
464 # to an actual command - the parentheses match kind of "overhead"
465 # - the more characters the parentheses match, the less attractive
466 # is the match.
467 my $regexp = "^\Q$beg\E"
468 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
469 qr<$regexp>
470 };
471
472 my @match;
473 my @penalty;
474
475 for (keys %{$self->{command}}) {
476 if (@penalty = $_ =~ $regexp) {
477 push @match, [$_, length join "", map "::$_", grep defined, @penalty];
478 }
479 }
480
481 @match = map $self->{command}{$_->[0]},
482 sort {
483 $a->[1] <=> $b->[1]
484 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
485 or (length $a->[0]) <=> (length $b->[0])
486 } @match;
487
488 $self->{last_search} = $cmd;
489 $self->{last_match} = \@match;
490
491 $self->{select_offset} = 0;
492 }
493
494 my @labels = @{ $self->{label} };
495 my @matches = @{ $self->{last_match} || [] };
496
497 if ($self->{select_offset}) {
498 splice @matches, 0, $self->{select_offset}, ();
499
500 my $label = shift @labels;
501 $label->set_text ("...");
502 $label->set_tooltip ("Use Cursor-Up to view previous matches");
503 }
504
505 for my $label (@labels) {
506 $label->{fg} = [1, 1, 1, 1];
507 $label->{bg} = [0, 0, 0, 0];
508 }
509
510 if (@matches) {
511 $self->{select} = "$matches[0][0]$arg";
512
513 $labels[0]->{fg} = [0, 0, 0, 1];
514 $labels[0]->{bg} = [1, 1, 1, 0.8];
515 } else {
516 $self->{select} = "$cmd$arg";
517 }
518
519 for my $match (@matches) {
520 my $label = shift @labels;
521
522 if (@labels) {
523 $label->set_text ("$match->[0]$arg");
524 $label->set_tooltip ($match->[1]);
525 } else {
526 $label->set_text ("...");
527 $label->set_tooltip ("Use Cursor-Down to view more matches");
528 last;
529 }
530 }
531
532 for my $label (@labels) {
533 $label->set_text ("");
534 $label->set_tooltip ("");
535 }
536
537 $self->update;
538 ###
539}
540
541sub _draw {
542 my ($self) = @_;
543
544 # hack
545 local $CFClient::UI::FOCUS = $self->{entry};
546
547 $self->SUPER::_draw;
373} 548}
374 549
3751 5501

Diff Legend

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