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

Diff Legend

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