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.8 by root, Sat Apr 22 21:47:45 2006 UTC vs.
Revision 1.24 by root, Wed May 17 10:14:52 2006 UTC

1package CFClient::MapWidget; 1package CFClient::MapWidget;
2 2
3use strict; 3use strict;
4use utf8;
4 5
5use List::Util qw(min max); 6use List::Util qw(min max);
6 7
7use CFClient::OpenGL; 8use CFClient::OpenGL;
8 9
9our @ISA = CFClient::UI::Base::; 10our @ISA = CFClient::UI::Base::;
10 11
11sub new { 12sub new {
12 my $class = shift; 13 my $class = shift;
13 14
14 $class->SUPER::new ( 15 my $self = $class->SUPER::new (
15 z => -1, 16 z => -1,
16 can_focus => 1, 17 can_focus => 1,
17 list => glGenList, 18 list => glGenList,
18 @_ 19 @_
19 ) 20 );
21
22 $self
20} 23}
21 24
22sub DESTROY { 25sub DESTROY {
23 my $self = shift; 26 my $self = shift;
24 27
… …
80 83
81 if (delete $self->{need_update}) { 84 if (delete $self->{need_update}) {
82 glNewList $self->{list}; 85 glNewList $self->{list};
83 86
84 if ($::MAP) { 87 if ($::MAP) {
85 my $sw = int $::WIDTH / 32; 88 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
86 my $sh = int $::HEIGHT / 32; 89 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
87 90
88 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32; 91 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
89 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32; 92 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
93
94 glPushMatrix;
95 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
90 96
91 glTranslate $sx0 - 32, $sy0 - 32, 0; 97 glTranslate $sx0 - 32, $sy0 - 32, 0;
92 98
93 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 99 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
94 100
… …
127 133
128 glDisable GL_TEXTURE_2D; 134 glDisable GL_TEXTURE_2D;
129 glDisable GL_BLEND; 135 glDisable GL_BLEND;
130 } 136 }
131 137
132 # HACK BEGIN 138 glPopMatrix;
133 {
134 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
135
136 glTranslate 0, 30;
137 my ($w, $h) = (250, 250);
138
139 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
140
141 glEnable GL_BLEND;
142 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
143 glEnable GL_TEXTURE_2D;
144 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
145
146 $self->{mapmap_texture} =
147 new CFClient::Texture
148 w => $w,
149 h => $h,
150 data => $::MAP->mapmap (- $w * 0.5, - $h * 0.5, $w, $h),
151 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
152
153 $self->{mapmap_texture}->draw_quad (0, 0);
154
155 glDisable GL_TEXTURE_2D;
156
157 glTranslate 0.375, 0.375;
158
159 glColor 1, 1, 0, 1;
160 glBegin GL_LINE_LOOP;
161 glVertex $w * 0.5 - $sx , $h * 0.5 - $sy ;
162 glVertex $w * 0.5 - $sx , $h * 0.5 - $sy + $sh;
163 glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy + $sh;
164 glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy ;
165 glEnd;
166
167 glDisable GL_BLEND;
168 }
169 # HACK END
170 } 139 }
171 140
172 glEndList; 141 glEndList;
173 } 142 }
174 143
… …
207); 176);
208 177
209sub key_down { 178sub key_down {
210 my ($self, $ev) = @_; 179 my ($self, $ev) = @_;
211 180
181 return unless $::CONN;
182
212 my $mod = $ev->{mod}; 183 my $mod = $ev->{mod};
213 my $sym = $ev->{sym}; 184 my $sym = $ev->{sym};
185 my $uni = $ev->{unicode};
214 186
215 if ($sym == CFClient::SDLK_KP5) { 187 if ($sym == CFClient::SDLK_KP5) {
216 $::CONN->user_send ("stay fire"); 188 $::CONN->user_send ("stay fire");
217 } elsif ($sym == ord "a") { 189 } elsif ($uni == ord ",") {
190 $::CONN->user_send ("take");
191 } elsif ($uni == ord "\t") {
218 $::CONN->user_send ("apply"); 192 $::CONN->user_send ("apply");
219 } elsif ($sym == ord "'") { 193 } elsif ($uni == ord "'") {
220 $self->emit ('activate_console'); 194 $self->emit ('activate_console');
221 } elsif ($sym == ord "/") { 195 } elsif ($uni == ord "/") {
222 $self->emit (activate_console => '/'); 196 $self->emit (activate_console => '/');
223 } elsif (exists $DIR{$sym}) { 197 } elsif (exists $DIR{$sym}) {
224 if ($mod & CFClient::KMOD_SHIFT) { 198 if ($mod & CFClient::KMOD_SHIFT) {
225 $self->{shft}++; 199 $self->{shft}++;
226 $::CONN->user_send ("fire $DIR{$sym}[0]"); 200 $::CONN->user_send ("fire $DIR{$sym}[0]");
… …
234 $self->{command_widget} ||= 208 $self->{command_widget} ||=
235 new CFClient::MapWidget::Command:: 209 new CFClient::MapWidget::Command::
236 command => $self->{command}, 210 command => $self->{command},
237 can_focus => 1, 211 can_focus => 1,
238 connect_execute => sub { 212 connect_execute => sub {
213 # todo: support callback instead of user_send
239 $::CONN->user_send ($_[1]); 214 $::CONN->user_send ($_[1]);
240 }, 215 },
241 connect_close => sub { 216 connect_close => sub {
242 (delete $self->{command_widget})->hide; 217 (delete $self->{command_widget})->hide;
243 $self->focus_in; 218 $self->focus_in;
244 }, 219 },
245 ; 220 ;
246 $self->{command_widget}->key_down ($ev); 221 $self->{command_widget}->key_down ($ev)
222 unless $ev->{unicode} == 20;
223 return unless $self->{command_widget};
247 $self->{command_widget}->show; 224 $self->{command_widget}->show;
248 $self->{command_widget}->focus_in; 225 $self->{command_widget}->focus_in;
249 } 226 }
250} 227}
251 228
… …
262 $::CONN->user_send ("run_stop"); 239 $::CONN->user_send ("run_stop");
263 } 240 }
264} 241}
265 242
266sub add_command { 243sub add_command {
267 my ($self, $command, $widget, $cb) = @_; 244 my ($self, $command, $tooltip, $widget, $cb) = @_;
268 245
269 (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g; 246 (my $data = $command) =~ s/\\//g;
270 247
271 push @{$self->{command}}, [$abbrev, $command]; 248 $tooltip =~ s/^\s+//;
272 #warn "$command|$abbrev|$widget\n";#d# 249
250 $tooltip = "<big>" . (CFClient::UI::Label::escape $data) . "</big>\n\n"
251 . CFClient::UI::Label::escape $tooltip;
252
253 $tooltip =~ s/\s+$//;
254
255 $self->{command}{$command} = [$data, $tooltip, $widget, $cb];
256}
257
258sub clr_commands {
259 my ($self) = @_;
260
261 %{$self->{command}} = ();
262}
263
264package CFClient::MapWidget::MapMap;
265
266our @ISA = CFClient::UI::Base::;
267
268use Time::HiRes qw(time);
269use CFClient::OpenGL;
270
271sub size_request {
272 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
273}
274
275sub size_allocate {
276 my ($self, $w, $h) = @_;
277
278 $self->SUPER::size_allocate ($w, $h);
279 $self->update;
280}
281
282sub update {
283 my ($self) = @_;
284
285 delete $self->{texture_atime};
286 $self->SUPER::update;
287}
288
289sub _draw {
290 my ($self) = @_;
291
292 $::MAP or return;
293
294 my ($w, $h) = @$self{qw(w h)};
295
296 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
297 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
298
299 my $sx = int $::CFG->{map_shift_x} / 32;
300 my $sy = int $::CFG->{map_shift_y} / 32;
301
302 my $ox = 0.5 * ($w - $sw);
303 my $oy = 0.5 * ($h - $sh);
304
305 glEnable GL_BLEND;
306 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
307 glEnable GL_TEXTURE_2D;
308 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
309
310 if ($self->{texture_atime} < time) {
311 $self->{texture_atime} = time + 1/3;
312
313 $self->{texture} =
314 new CFClient::Texture
315 w => $w,
316 h => $h,
317 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
318 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
319 }
320
321 $self->{texture}->draw_quad (0, 0);
322
323 glDisable GL_TEXTURE_2D;
324
325 glTranslate 0.375, 0.375;
326
327 #TODO: map scale is completely borked
328
329 my $x0 = int $ox - $sx + 0.5;
330 my $y0 = int $oy - $sy + 0.5;
331
332 glColor 1, 1, 0, 1;
333 glBegin GL_LINE_LOOP;
334 glVertex $x0 , $y0 ;
335 glVertex $x0 , $y0 + $sh;
336 glVertex $x0 + $sw, $y0 + $sh;
337 glVertex $x0 + $sw, $y0 ;
338 glEnd;
339
340 glDisable GL_BLEND;
273} 341}
274 342
275package CFClient::MapWidget::Command; 343package CFClient::MapWidget::Command;
276 344
277use strict; 345use strict;
278 346
279use CFClient::OpenGL; 347use CFClient::OpenGL;
280 348
281our @ISA = CFClient::UI::VBox::; 349our @ISA = CFClient::UI::Frame::;
282 350
283sub new { 351sub new {
284 my $class = shift; 352 my $class = shift;
285 353
286 my $self = $class->SUPER::new ( 354 my $self = $class->SUPER::new (
355 bg => [0, 0, 0, 0.8],
287 @_, 356 @_,
288 children => [map 357 );
358
359 $self->add ($self->{vbox} = new CFClient::UI::VBox);
360
361 $self->{label} = [
362 map
289 CFClient::UI::Label->new ( 363 CFClient::UI::Label->new (
290 can_hover => 1, 364 can_hover => 1,
365 can_events => 1,
291 fontsize => $_, 366 fontsize => $_,
292 ), 1, 1, 0.8, 0.8, 0.8, 0.8, 0.8 367 ), (0.8) x 6
368 ];
369
370 $self->{entry} = new CFClient::UI::Entry
371 connect_changed => sub {
372 $self->update_labels;
293 ], 373 };
374
375 $self->{vbox}->add (
376 $self->{entry},
377 @{$self->{label}},
294 ); 378 );
295 379
296 $self 380 $self
297} 381}
298 382
… …
301 385
302 $self->SUPER::size_allocate ($w, $h); 386 $self->SUPER::size_allocate ($w, $h);
303 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 387 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
304} 388}
305 389
306sub update_labels {
307 my ($self) = @_;
308
309 my $command = $self->{command};
310 my $search_abbrev = qr/^\Q$self->{search}/;
311 my $search_full = qr/\Q$self->{search}/;
312
313 my @found;
314
315 for (@$command) {
316 if ($_->[0] =~ $search_abbrev) {
317 push @found, [$_->[0], $_];
318 } elsif ($_[1] =~ $search_full) {
319 push @found, [$_->[1], $_];
320 }
321 }
322
323 @found = sort { $a->[0] cmp $b->[0] } @found;
324
325 $self->{children}[0]->set_text ("$self->{search}_");
326
327 for (0..5) {
328 $self->{children}[$_ + 1]->set_text ($found[$_] ? "$found[$_][0] ($found[$_][1][1])" : "");
329 }
330
331 $self->{select} = $found[0][1][1]
332 if @found;
333
334 if (@found > 6) {
335 $self->{children}[6]->set_text ("...");
336 }
337
338 $self->check_size;
339}
340
341sub key_down { 390sub key_down {
342 my ($self, $ev) = @_; 391 my ($self, $ev) = @_;
343 392
344 if ($ev->{sym} == 8) { 393 if ($ev->{sym} == 13) {
345 substr $self->{search}, -1, 1, "";
346 $self->update_labels;
347 } elsif ($ev->{sym} == 13) {
348 if (exists $self->{select}) { 394 if (exists $self->{select}) {
349 $self->emit (execute => $self->{select}); 395 $self->emit (execute => $self->{select});
350 $self->emit ("close"); 396 $self->emit ("close");
351 } 397 }
352 } elsif ($ev->{sym} == 27) { 398 } elsif ($ev->{sym} == 27) {
399 $self->{entry}->set_text ("");
353 $self->emit ("close"); 400 $self->emit ("close");
354 } elsif ($ev->{unicode}) { 401 return;
355 $self->{search} .= chr $ev->{unicode}; 402 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
403 ++$self->{select_offset}
404 if $self->{select_offset} < $#{ $self->{last_match} || [] };
356 $self->update_labels; 405 $self->update_labels;
406 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
407 --$self->{select_offset}
408 if $self->{select_offset};
409 $self->update_labels;
410 } else {
411 #$self->{entry}{force_alloc} = 1;
412 $self->{entry}->key_down ($ev);
357 } 413 }
414}
415
416sub update_labels {
417 my ($self) = @_;
418
419 my $text = $self->{entry}->get_text;
420
421 length $text
422 or return $self->emit ("close");
423
424 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
425
426 if ($cmd ne $self->{last_search}) {
427 my $regexp = do {
428 my ($beg, @chr) = split //, lc $cmd;
429
430 # the following regex is used to match our "completion entry"
431 # to an actual command - the parentheses match kind of "overhead"
432 # - the more characters the parentheses match, the less attractive
433 # is the match.
434 my $regexp = "^\Q$beg\E"
435 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
436 qr<$regexp>
437 };
438
439 my @match;
440 my @penalty;
441
442 for (keys %{$self->{command}}) {
443 if (@penalty = $_ =~ $regexp) {
444 push @match, [$_, length join "", map "::$_", grep defined, @penalty];
445 }
446 }
447
448 @match = map $self->{command}{$_->[0]},
449 sort {
450 $a->[1] <=> $b->[1]
451 or (length $a->[0]) <=> (length $b->[0])
452 } @match;
453
454 $self->{last_search} = $cmd;
455 $self->{last_match} = \@match;
456
457 $self->{select_offset} = 0;
458 }
459
460 my @labels = @{ $self->{label} };
461 my @matches = @{ $self->{last_match} || [] };
462
463 if ($self->{select_offset}) {
464 splice @matches, 0, $self->{select_offset}, ();
465
466 my $label = shift @labels;
467 $label->set_text ("...");
468 $label->set_tooltip ("Use Cursor-Up to view previous matches");
469 }
470
471 for my $label (@labels) {
472 $label->{fg} = [1, 1, 1, 1];
473 $label->{bg} = [0, 0, 0, 0];
474 }
475
476 if (@matches) {
477 $self->{select} = "$matches[0][0]$arg";
478
479 $labels[0]->{fg} = [0, 0, 0, 1];
480 $labels[0]->{bg} = [1, 1, 1, 0.8];
481 } else {
482 $self->{select} = "$cmd$arg";
483 }
484
485 for my $match (@matches) {
486 my $label = shift @labels;
487
488 if (@labels) {
489 $label->set_text ("$match->[0]$arg");
490 $label->set_tooltip ($match->[1]);
491 } else {
492 $label->set_text ("...");
493 $label->set_tooltip ("Use Cursor-Down to view more matches");
494 last;
495 }
496 }
497
498 for my $label (@labels) {
499 $label->set_text ("");
500 $label->set_tooltip ("");
501 }
502
503 $self->update;
504 ###
505}
506
507sub _draw {
508 my ($self) = @_;
509
510 # hack
511 local $CFClient::UI::FOCUS = $self->{entry};
512
513 $self->SUPER::_draw;
358} 514}
359 515
3601 5161

Diff Legend

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