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

Diff Legend

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