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.7 by root, Thu Apr 20 21:28:50 2006 UTC vs.
Revision 1.36 by root, Thu May 25 00:26:19 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 );
20}
21 21
22sub DESTROY { 22 $self->{completer} = new CFClient::MapWidget::Command::
23 command => $self->{command},
24 can_focus => 1,
25 ;
26
27 $self
28}
29
30sub add_command {
31 my ($self, $command, $tooltip, $widget, $cb) = @_;
32
33 (my $data = $command) =~ s/\\//g;
34
35 $tooltip =~ s/^\s+//;
36
37 $tooltip = "<big>$data</big>\n\n$tooltip";
38
39 $tooltip =~ s/\s+$//;
40
41 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
42}
43
44sub clr_commands {
23 my $self = shift; 45 my ($self) = @_;
24 46
25 glDeleteList $self->{list}; 47 %{$self->{completer}{command}} = ();
26
27 $self->SUPER::DESTROY;
28}
29
30sub key_down {
31 print "MAPKEYDOWN\n";
32}
33
34sub key_up {
35} 48}
36 49
37sub button_down { 50sub button_down {
38 my ($self, $ev, $x, $y) = @_; 51 my ($self, $ev, $x, $y) = @_;
39 52
… …
80 93
81 $self->{need_update} = 1; 94 $self->{need_update} = 1;
82 $self->SUPER::update; 95 $self->SUPER::update;
83} 96}
84 97
98my %DIR = (
99 CFClient::SDLK_KP8, [1, "north"],
100 CFClient::SDLK_KP9, [2, "northeast"],
101 CFClient::SDLK_KP6, [3, "east"],
102 CFClient::SDLK_KP3, [4, "southeast"],
103 CFClient::SDLK_KP2, [5, "south"],
104 CFClient::SDLK_KP1, [6, "southwest"],
105 CFClient::SDLK_KP4, [7, "west"],
106 CFClient::SDLK_KP7, [8, "northwest"],
107
108 CFClient::SDLK_UP, [1, "north"],
109 CFClient::SDLK_RIGHT, [3, "east"],
110 CFClient::SDLK_DOWN, [5, "south"],
111 CFClient::SDLK_LEFT, [7, "west"],
112);
113
114sub key_down {
115 my ($self, $ev) = @_;
116
117 return unless $::CONN;
118
119 my $mod = $ev->{mod};
120 my $sym = $ev->{sym};
121 my $uni = $ev->{unicode};
122
123 if ($sym == CFClient::SDLK_KP5) {
124 $::CONN->user_send ("stay fire");
125 } elsif ($uni == ord ",") {
126 $::CONN->user_send ("take");
127 } elsif ($uni == ord " ") {
128 $::CONN->user_send ("apply");
129 } elsif ($uni == ord "\t") {
130 # TODO: toggle inventory
131 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") {
132 $::CONN->user_send ("rotateshoottype +");
133 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") {
134 $::CONN->user_send ("rotateshoottype -");
135 } elsif ($uni == ord '"') {
136 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
137 $self->{completer}->show;
138 } elsif ($uni == ord "'") {
139 $self->{completer}->set_prefix ("");
140 $self->{completer}->show;
141 } elsif (exists $DIR{$sym}) {
142 if ($mod & CFClient::KMOD_SHIFT) {
143 $self->{shft}++;
144 $::CONN->user_send ("fire $DIR{$sym}[0]");
145 } elsif ($mod & CFClient::KMOD_CTRL) {
146 $self->{ctrl}++;
147 $::CONN->user_send ("run $DIR{$sym}[0]");
148 } else {
149 $::CONN->user_send ("$DIR{$sym}[1]");
150 }
151 } elsif ($ev->{unicode}) {
152 $self->{completer}->key_down ($ev);
153 $self->{completer}->show;
154 }
155}
156
157sub key_up {
158 my ($self, $ev) = @_;
159
160 my $mod = $ev->{mod};
161 my $sym = $ev->{sym};
162
163 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
164 $::CONN->user_send ("fire_stop");
165 }
166 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
167 $::CONN->user_send ("run_stop");
168 }
169}
170
85sub draw { 171sub draw {
86 my ($self) = @_; 172 my ($self) = @_;
173
174 my $focused = $CFClient::UI::FOCUS == $self
175 || $CFClient::UI::FOCUS == $self->{completer}{entry};
176
177 return
178 unless $focused || !$::FAST;
87 179
88 if (delete $self->{need_update}) { 180 if (delete $self->{need_update}) {
89 glNewList $self->{list}; 181 glNewList $self->{list};
90 182
91 if ($::MAP) { 183 if ($::MAP) {
92 my $sw = int $::WIDTH / 32; 184 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
93 my $sh = int $::HEIGHT / 32; 185 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
94 186
95 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32; 187 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
96 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32; 188 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
189
190 glPushMatrix;
191 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
97 192
98 glTranslate $sx0 - 32, $sy0 - 32, 0; 193 glTranslate $sx0 - 32, $sy0 - 32, 0;
99 194
100 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 195 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
101 196
… …
113 0.05, 0.13, 0.05, 208 0.05, 0.13, 0.05,
114 ); 209 );
115 glEnable GL_CONVOLUTION_2D; 210 glEnable GL_CONVOLUTION_2D;
116 } 211 }
117 212
213 $self->{fow_texture_name} ||= glGenTexture;
214 # try to re-use the texture name: TODO improve texture class instead
215
118 $self->{fow_texture} = new CFClient::Texture 216 $self->{fow_texture} = new CFClient::Texture
119 w => $w, 217 w => $w,
120 h => $h, 218 h => $h,
121 data => $data, 219 data => $data,
220 name => $self->{fow_texture_name},
122 internalformat => GL_ALPHA, 221 internalformat => GL_ALPHA,
123 format => GL_ALPHA; 222 format => GL_ALPHA;
124 223
125 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 224 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
126 225
127 glEnable GL_BLEND;
128 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
129 glEnable GL_TEXTURE_2D; 226 glEnable GL_TEXTURE_2D;
130 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 227 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
131 228
132 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 229 glColor +($::CFG->{fow_intensity}) x 3, 0.8;
133 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32); 230 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32);
134 231
135 glDisable GL_TEXTURE_2D; 232 glDisable GL_TEXTURE_2D;
136 glDisable GL_BLEND;
137 } 233 }
138 234
139 # HACK BEGIN 235 glPopMatrix;
140 {
141 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
142
143 glTranslate 0, 30;
144 my ($w, $h) = (250, 250);
145
146 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
147
148 glEnable GL_BLEND;
149 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
150 glEnable GL_TEXTURE_2D;
151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
152
153 $self->{mapmap_texture} =
154 new CFClient::Texture
155 w => $w,
156 h => $h,
157 data => $::MAP->mapmap (- $w * 0.5, - $h * 0.5, $w, $h),
158 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
159
160 $self->{mapmap_texture}->draw_quad (0, 0);
161
162 glDisable GL_TEXTURE_2D;
163
164 glTranslate 0.375, 0.375;
165
166 glColor 1, 1, 0, 1;
167 glBegin GL_LINE_LOOP;
168 glVertex $w * 0.5 - $sx , $h * 0.5 - $sy ;
169 glVertex $w * 0.5 - $sx , $h * 0.5 - $sy + $sh;
170 glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy + $sh;
171 glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy ;
172 glEnd;
173
174 glDisable GL_BLEND;
175 }
176 # HACK END
177 } 236 }
178 237
179 glEndList; 238 glEndList;
180 } 239 }
181 240
182 glPushMatrix; 241 glPushMatrix;
183 glCallList $self->{list}; 242 glCallList $self->{list};
184 glPopMatrix; 243 glPopMatrix;
185 244
186 if ($CFClient::UI::FOCUS != $self) { 245 # TNT2 emulates logops in software (or worse :)
187 glColor 64/255, 64/255, 64/255; 246 if ($focused) {
188 glLogicOp GL_AND; 247 (delete $self->{out_of_focus})->destroy
189 glEnable GL_COLOR_LOGIC_OP; 248 if $self->{out_of_focus};
249 } else {
250 glColor 0.4, 0.2, 0.2, 0.6;
251 glEnable GL_BLEND;
252 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
190 glBegin GL_QUADS; 253 glBegin GL_QUADS;
191 glVertex 0, 0; 254 glVertex 0, 0;
192 glVertex 0, $::HEIGHT; 255 glVertex 0, $::HEIGHT;
193 glVertex $::WIDTH, $::HEIGHT; 256 glVertex $::WIDTH, $::HEIGHT;
194 glVertex $::WIDTH, 0; 257 glVertex $::WIDTH, 0;
195 glEnd; 258 glEnd;
196 glDisable GL_COLOR_LOGIC_OP; 259 glDisable GL_BLEND;
260
261 $self->{out_of_focus} ||= do {
262 my $label = new CFClient::UI::Label
263 x => 0,
264 y => 0,
265 z => 1,
266 ellipsise => 0,
267 text => "map out of focus (click map to play)";
268
269 $label->show;
270 $label->update;
271
272 $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
273 $label->move (
274 ($::WIDTH - $label->{w}) * 0.5,
275 ($::HEIGHT - $label->{h}) * 0.5,
276 );
277 });
278
279 $label
280 };
281 }
282}
283
284sub DESTROY {
285 my $self = shift;
286
287 glDeleteList $self->{list};
288
289 $self->SUPER::DESTROY;
290}
291
292package CFClient::MapWidget::MapMap;
293
294our @ISA = CFClient::UI::Base::;
295
296use Time::HiRes qw(time);
297use CFClient::OpenGL;
298
299sub size_request {
300 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
301}
302
303sub size_allocate {
304 my ($self, $w, $h) = @_;
305
306 $self->SUPER::size_allocate ($w, $h);
307 $self->update;
308}
309
310sub update {
311 my ($self) = @_;
312
313 delete $self->{texture_atime};
314 $self->SUPER::update;
315}
316
317sub _draw {
318 my ($self) = @_;
319
320 $::MAP or return;
321
322 my ($w, $h) = @$self{qw(w h)};
323
324 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
325 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
326
327 my $sx = int $::CFG->{map_shift_x} / 32;
328 my $sy = int $::CFG->{map_shift_y} / 32;
329
330 my $ox = 0.5 * ($w - $sw);
331 my $oy = 0.5 * ($h - $sh);
332
333 glEnable GL_BLEND;
334 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
335 glEnable GL_TEXTURE_2D;
336 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
337
338 if ($self->{texture_atime} < time) {
339 $self->{texture_atime} = time + 1/3;
340
341 $self->{texture} =
342 new CFClient::Texture
343 w => $w,
344 h => $h,
345 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
346 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
347 }
348
349 $self->{texture}->draw_quad (0, 0);
350
351 glDisable GL_TEXTURE_2D;
352
353 glTranslate 0.375, 0.375;
354
355 #TODO: map scale is completely borked
356
357 my $x0 = int $ox - $sx + 0.5;
358 my $y0 = int $oy - $sy + 0.5;
359
360 glColor 1, 1, 0, 1;
361 glBegin GL_LINE_LOOP;
362 glVertex $x0 , $y0 ;
363 glVertex $x0 , $y0 + $sh;
364 glVertex $x0 + $sw, $y0 + $sh;
365 glVertex $x0 + $sw, $y0 ;
366 glEnd;
197 } 367
368 glDisable GL_BLEND;
198} 369}
199 370
200my %DIR = ( 371package CFClient::MapWidget::Command;
201 CFClient::SDLK_KP8, [1, "north"],
202 CFClient::SDLK_KP9, [2, "northeast"],
203 CFClient::SDLK_KP6, [3, "east"],
204 CFClient::SDLK_KP3, [4, "southeast"],
205 CFClient::SDLK_KP2, [5, "south"],
206 CFClient::SDLK_KP1, [6, "southwest"],
207 CFClient::SDLK_KP4, [7, "west"],
208 CFClient::SDLK_KP7, [8, "northwest"],
209 372
210 CFClient::SDLK_UP, [1, "north"], 373use strict;
211 CFClient::SDLK_RIGHT, [3, "east"], 374
212 CFClient::SDLK_DOWN, [5, "south"], 375use CFClient::OpenGL;
213 CFClient::SDLK_LEFT, [7, "west"], 376
214); 377our @ISA = CFClient::UI::Frame::;
378
379sub new {
380 my $class = shift;
381
382 my $self = $class->SUPER::new (
383 bg => [0, 0, 0, 0.8],
384 @_,
385 );
386
387 $self->add ($self->{vbox} = new CFClient::UI::VBox);
388
389 $self->{label} = [
390 map
391 CFClient::UI::Label->new (
392 can_hover => 1,
393 can_events => 1,
394 tooltip_width => 0.33,
395 fontsize => $_,
396 ), (0.8) x 16
397 ];
398
399 $self->{entry} = new CFClient::UI::Entry
400 connect_changed => sub {
401 $self->update_labels;
402 },
403 connect_key_down => sub {
404 my ($entry, $ev) = @_;
405
406 my $self = $entry->{parent}{parent};
407
408 if ($ev->{sym} == 13) {
409 if (exists $self->{select}) {
410 $::CONN->user_send ($self->{select});
411 $self->hide;
412 }
413 } elsif ($ev->{sym} == 27) {
414 $self->hide;
415 return;
416 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
417 ++$self->{select_offset}
418 if $self->{select_offset} < $#{ $self->{last_match} || [] };
419 $self->update_labels;
420 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
421 --$self->{select_offset}
422 if $self->{select_offset};
423 $self->update_labels;
424 } else {
425 return 0;
426 }
427
428 1
429 }
430 ;
431
432 $self->{vbox}->add (
433 $self->{entry},
434 @{$self->{label}},
435 );
436
437 $self
438}
439
440sub set_prefix {
441 my ($self, $prefix) = @_;
442
443 $self->{entry}->set_text ($prefix);
444 $self->show;
445}
446
447sub size_allocate {
448 my ($self, $w, $h) = @_;
449
450 $self->SUPER::size_allocate ($w, $h);
451 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
452}
453
454sub show {
455 my ($self) = @_;
456
457 $self->SUPER::show;
458 $self->{entry}->focus_in;
459}
460
461sub hide {
462 my ($self) = @_;
463
464 $self->SUPER::hide;
465 $self->{entry}->set_text ("");
466}
215 467
216sub key_down { 468sub key_down {
217 my ($self, $ev) = @_; 469 my ($self, $ev) = @_;
218 470
219 my $mod = $ev->{mod}; 471 $self->{entry}->key_down ($ev);
220 my $sym = $ev->{sym}; 472}
221 473
222 if ($sym == CFClient::SDLK_KP5) { 474sub update_labels {
223 $::CONN->user_send ("stay fire"); 475 my ($self) = @_;
224 } elsif ($sym == ord "a") { 476
225 $::CONN->user_send ("apply"); 477 my $text = $self->{entry}->get_text;
226 } elsif ($sym == ord "'") { 478
227 $self->emit ('activate_console'); 479 length $text
228 } elsif ($sym == ord "/") { 480 or return $self->hide;
229 $self->emit ('activate_console' => '/'); 481
230 } elsif (exists $DIR{$sym}) { 482 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
231 if ($mod & CFClient::KMOD_SHIFT) { 483
232 $self->{shft}++; 484 if ($text ne $self->{last_search}) {
233 $::CONN->user_send ("fire $DIR{$sym}[0]"); 485 my @match;
234 } elsif ($mod & CFClient::KMOD_CTRL) { 486
235 $self->{ctrl}++; 487 if ($text =~ /^(.*?)\s+$/) {
236 $::CONN->user_send ("run $DIR{$sym}[0]"); 488 @match = [$cmd, "(appended whitespace suppresses completion)"];
237 } else { 489 } else {
238 $::CONN->user_send ("$DIR{$sym}[1]"); 490 my $regexp = do {
491 my ($beg, @chr) = split //, lc $cmd;
492
493 # the following regex is used to match our "completion entry"
494 # to an actual command - the parentheses match kind of "overhead"
495 # - the more characters the parentheses match, the less attractive
496 # is the match.
497 my $regexp = "^\Q$beg\E"
498 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
499 qr<$regexp>
500 };
501
502 my @penalty;
503
504 for (keys %{$self->{command}}) {
505 if (@penalty = $_ =~ $regexp) {
506 push @match, [$_, length join "", map "::$_", grep defined, @penalty];
507 }
508 }
509
510 @match = map $self->{command}{$_->[0]},
511 sort {
512 $a->[1] <=> $b->[1]
513 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
514 or (length $a->[0]) <=> (length $b->[0])
515 } @match;
239 } 516 }
240 }
241}
242 517
243sub key_up { 518 $self->{last_search} = $cmd;
519 $self->{last_match} = \@match;
520
521 $self->{select_offset} = 0;
522 }
523
524 my @labels = @{ $self->{label} };
525 my @matches = @{ $self->{last_match} || [] };
526
527 if ($self->{select_offset}) {
528 splice @matches, 0, $self->{select_offset}, ();
529
530 my $label = shift @labels;
531 $label->set_text ("...");
532 $label->set_tooltip ("Use Cursor-Up to view previous matches");
533 }
534
535 for my $label (@labels) {
536 $label->{fg} = [1, 1, 1, 1];
537 $label->{bg} = [0, 0, 0, 0];
538 }
539
540 if (@matches) {
541 $self->{select} = "$matches[0][0]$arg";
542
543 $labels[0]->{fg} = [0, 0, 0, 1];
544 $labels[0]->{bg} = [1, 1, 1, 0.8];
545 } else {
546 $self->{select} = "$cmd$arg";
547 }
548
549 for my $match (@matches) {
550 my $label = shift @labels;
551
552 if (@labels) {
553 $label->set_text ("$match->[0]$arg");
554 $label->set_tooltip ($match->[1]);
555 } else {
556 $label->set_text ("...");
557 $label->set_tooltip ("Use Cursor-Down to view more matches");
558 last;
559 }
560 }
561
562 for my $label (@labels) {
563 $label->set_text ("");
564 $label->set_tooltip ("");
565 }
566
567 $self->update;
568 ###
569}
570
571sub _draw {
244 my ($self, $ev) = @_; 572 my ($self) = @_;
245 573
246 my $mod = $ev->{mod}; 574 # hack
247 my $sym = $ev->{sym}; 575 local $CFClient::UI::FOCUS = $self->{entry};
248 576
249 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 577 $self->SUPER::_draw;
250 $::CONN->user_send ("fire_stop");
251 }
252 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
253 $::CONN->user_send ("run_stop");
254 }
255}
256
257sub add_command {
258 my ($self, $command, $widget, $cb) = @_;
259
260 (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;
261 warn "$command|$abbrev|$widget\n";#d#
262} 578}
263 579
2641 5801

Diff Legend

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