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

Diff Legend

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