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.12 by root, Mon Apr 24 06:05:35 2006 UTC vs.
Revision 1.25 by root, Wed May 17 15:18:57 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 * $::CFG->{map_scale}); 88 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
86 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}); 89 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
87
88 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
89 90
90 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; 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;
91 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; 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};
92 96
93 glTranslate $sx0 - 32, $sy0 - 32, 0; 97 glTranslate $sx0 - 32, $sy0 - 32, 0;
94 98
95 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);
96 100
… …
129 133
130 glDisable GL_TEXTURE_2D; 134 glDisable GL_TEXTURE_2D;
131 glDisable GL_BLEND; 135 glDisable GL_BLEND;
132 } 136 }
133 137
134 # HACK BEGIN 138 glPopMatrix;
135 {
136 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
137
138 glTranslate 0, 30;
139 my ($w, $h) = (250, 250);
140
141 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
142
143 glEnable GL_BLEND;
144 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
145 glEnable GL_TEXTURE_2D;
146 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
147
148 $self->{mapmap_texture} =
149 new CFClient::Texture
150 w => $w,
151 h => $h,
152 data => $::MAP->mapmap (- $w * 0.5, - $h * 0.5, $w, $h),
153 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
154
155 $self->{mapmap_texture}->draw_quad (0, 0);
156
157 glDisable GL_TEXTURE_2D;
158
159 glTranslate 0.375, 0.375;
160
161 glColor 1, 1, 0, 1;
162 glBegin GL_LINE_LOOP;
163 glVertex $w * 0.5 - $sx , $h * 0.5 - $sy ;
164 glVertex $w * 0.5 - $sx , $h * 0.5 - $sy + $sh;
165 glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy + $sh;
166 glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy ;
167 glEnd;
168
169 glDisable GL_BLEND;
170 }
171 # HACK END
172 } 139 }
173 140
174 glEndList; 141 glEndList;
175 } 142 }
176 143
… …
209); 176);
210 177
211sub key_down { 178sub key_down {
212 my ($self, $ev) = @_; 179 my ($self, $ev) = @_;
213 180
181 return unless $::CONN;
182
214 my $mod = $ev->{mod}; 183 my $mod = $ev->{mod};
215 my $sym = $ev->{sym}; 184 my $sym = $ev->{sym};
185 my $uni = $ev->{unicode};
216 186
217 if ($sym == CFClient::SDLK_KP5) { 187 if ($sym == CFClient::SDLK_KP5) {
218 $::CONN->user_send ("stay fire"); 188 $::CONN->user_send ("stay fire");
219 } elsif ($sym == ord "a") { 189 } elsif ($uni == ord ",") {
190 $::CONN->user_send ("take");
191 } elsif ($uni == ord "\t") {
220 $::CONN->user_send ("apply"); 192 $::CONN->user_send ("apply");
221 } elsif ($sym == ord "'") { 193 } elsif ($uni == ord "'") {
222 $self->emit ('activate_console'); 194 $self->emit ('activate_console');
223 } elsif ($sym == ord "/") { 195 } elsif ($uni == ord "/") {
224 $self->emit (activate_console => '/'); 196 $self->emit (activate_console => '/');
225 } elsif (exists $DIR{$sym}) { 197 } elsif (exists $DIR{$sym}) {
226 if ($mod & CFClient::KMOD_SHIFT) { 198 if ($mod & CFClient::KMOD_SHIFT) {
227 $self->{shft}++; 199 $self->{shft}++;
228 $::CONN->user_send ("fire $DIR{$sym}[0]"); 200 $::CONN->user_send ("fire $DIR{$sym}[0]");
… …
237 new CFClient::MapWidget::Command:: 209 new CFClient::MapWidget::Command::
238 command => $self->{command}, 210 command => $self->{command},
239 can_focus => 1, 211 can_focus => 1,
240 connect_execute => sub { 212 connect_execute => sub {
241 # todo: support callback instead of user_send 213 # todo: support callback instead of user_send
242 $::CONN->user_send ($_[1][1]); 214 $::CONN->user_send ($_[1]);
243 }, 215 },
244 connect_close => sub { 216 connect_close => sub {
245 (delete $self->{command_widget})->hide; 217 (delete $self->{command_widget})->hide;
246 $self->focus_in; 218 $self->focus_in;
247 }, 219 },
248 ; 220 ;
249 $self->{command_widget}->key_down ($ev); 221 $self->{command_widget}->key_down ($ev)
222 unless $ev->{unicode} == 20;
250 return unless $self->{command_widget}; 223 return unless $self->{command_widget};
251 $self->{command_widget}->show; 224 $self->{command_widget}->show;
252 $self->{command_widget}->focus_in; 225 $self->{command_widget}->focus_in;
253 } 226 }
254} 227}
… …
268} 241}
269 242
270sub add_command { 243sub add_command {
271 my ($self, $command, $tooltip, $widget, $cb) = @_; 244 my ($self, $command, $tooltip, $widget, $cb) = @_;
272 245
273 (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g; 246 (my $data = $command) =~ s/\\//g;
274 247
248 $tooltip =~ s/^\s+//;
249
250 $tooltip = "<big>$data</big>\n\n$tooltip";
251
252 $tooltip =~ s/\s+$//;
253
275 push @{$self->{command}}, [$abbrev, $command, $tooltip, $widget, $cb]; 254 $self->{command}{$command} = [$data, $tooltip, $widget, $cb];
255}
256
257sub clr_commands {
258 my ($self) = @_;
259
260 %{$self->{command}} = ();
261}
262
263package CFClient::MapWidget::MapMap;
264
265our @ISA = CFClient::UI::Base::;
266
267use Time::HiRes qw(time);
268use CFClient::OpenGL;
269
270sub size_request {
271 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
272}
273
274sub size_allocate {
275 my ($self, $w, $h) = @_;
276
277 $self->SUPER::size_allocate ($w, $h);
278 $self->update;
279}
280
281sub update {
282 my ($self) = @_;
283
284 delete $self->{texture_atime};
285 $self->SUPER::update;
286}
287
288sub _draw {
289 my ($self) = @_;
290
291 $::MAP or return;
292
293 my ($w, $h) = @$self{qw(w h)};
294
295 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
296 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
297
298 my $sx = int $::CFG->{map_shift_x} / 32;
299 my $sy = int $::CFG->{map_shift_y} / 32;
300
301 my $ox = 0.5 * ($w - $sw);
302 my $oy = 0.5 * ($h - $sh);
303
304 glEnable GL_BLEND;
305 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
306 glEnable GL_TEXTURE_2D;
307 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
308
309 if ($self->{texture_atime} < time) {
310 $self->{texture_atime} = time + 1/3;
311
312 $self->{texture} =
313 new CFClient::Texture
314 w => $w,
315 h => $h,
316 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
317 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
318 }
319
320 $self->{texture}->draw_quad (0, 0);
321
322 glDisable GL_TEXTURE_2D;
323
324 glTranslate 0.375, 0.375;
325
326 #TODO: map scale is completely borked
327
328 my $x0 = int $ox - $sx + 0.5;
329 my $y0 = int $oy - $sy + 0.5;
330
331 glColor 1, 1, 0, 1;
332 glBegin GL_LINE_LOOP;
333 glVertex $x0 , $y0 ;
334 glVertex $x0 , $y0 + $sh;
335 glVertex $x0 + $sw, $y0 + $sh;
336 glVertex $x0 + $sw, $y0 ;
337 glEnd;
338
339 glDisable GL_BLEND;
276} 340}
277 341
278package CFClient::MapWidget::Command; 342package CFClient::MapWidget::Command;
279 343
280use strict; 344use strict;
281 345
282use CFClient::OpenGL; 346use CFClient::OpenGL;
283 347
284our @ISA = CFClient::UI::VBox::; 348our @ISA = CFClient::UI::Frame::;
285 349
286sub new { 350sub new {
287 my $class = shift; 351 my $class = shift;
288 352
289 my $self = $class->SUPER::new ( 353 my $self = $class->SUPER::new (
354 bg => [0, 0, 0, 0.8],
290 @_, 355 @_,
291 children => [map 356 );
357
358 $self->add ($self->{vbox} = new CFClient::UI::VBox);
359
360 $self->{label} = [
361 map
292 CFClient::UI::Label->new ( 362 CFClient::UI::Label->new (
293 can_hover => 1, 363 can_hover => 1,
294 can_events => 1, 364 can_events => 1,
365 tooltip_width => 0.33,
295 fontsize => $_, 366 fontsize => $_,
296 ), 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;
297 ], 373 };
374
375 $self->{vbox}->add (
376 $self->{entry},
377 @{$self->{label}},
298 ); 378 );
299 379
300 $self 380 $self
301} 381}
302 382
… …
305 385
306 $self->SUPER::size_allocate ($w, $h); 386 $self->SUPER::size_allocate ($w, $h);
307 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 387 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
308} 388}
309 389
310sub update_labels {
311 my ($self) = @_;
312
313 my $command = $self->{command};
314 my $search_abbrev = qr/^\Q$self->{search}/;
315 my $search_full = qr/\Q$self->{search}/;
316
317 my @found;
318
319 for (@$command) {
320 if ($_->[0] =~ $search_abbrev) {
321 push @found, [$_->[0], $_];
322 } elsif ($_[1] =~ $search_full) {
323 push @found, [$_->[1], $_];
324 }
325 }
326
327 @found = sort { $a->[0] cmp $b->[0] } @found;
328
329 $self->{children}[0]->set_text ("$self->{search}_");
330
331 for (0..5) {
332 $self->{children}[$_ + 1]->set_text ($found[$_] ? "$found[$_][0] ($found[$_][1][1])" : "");
333 $self->{children}[$_ + 1]{tooltip} = ($found[$_] ? $found[$_][1][2] : "");
334 }
335
336 $self->{select} = $found[0][1]
337 if @found;
338
339 if (@found > 6) {
340 $self->{children}[6]->set_text ("...");
341 }
342
343 $self->check_size;
344}
345
346sub key_down { 390sub key_down {
347 my ($self, $ev) = @_; 391 my ($self, $ev) = @_;
348 392
349 if ($ev->{sym} == 8) { 393 if ($ev->{sym} == 13) {
350 substr $self->{search}, -1, 1, "";
351 $self->update_labels;
352 } elsif ($ev->{sym} == 13) {
353 if (exists $self->{select}) { 394 if (exists $self->{select}) {
354 $self->emit (execute => $self->{select}); 395 $self->emit (execute => $self->{select});
355 $self->emit ("close"); 396 $self->emit ("close");
356 } 397 }
357 } elsif ($ev->{sym} == 27) { 398 } elsif ($ev->{sym} == 27) {
399 $self->{entry}->set_text ("");
358 $self->emit ("close"); 400 $self->emit ("close");
359 } elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) { 401 return;
360 $self->{search} .= chr $ev->{unicode}; 402 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
403 ++$self->{select_offset}
404 if $self->{select_offset} < $#{ $self->{last_match} || [] };
361 $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);
362 } 413 }
414}
363 415
364 length $self->{search} 416sub update_labels {
417 my ($self) = @_;
418
419 my $text = $self->{entry}->get_text;
420
421 length $text
365 or $self->emit ("close"); 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;
366} 514}
367 515
3681 5161

Diff Legend

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