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

Diff Legend

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