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.29 by root, Thu May 18 16:42:26 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 }
110 119
111 $self->{fow_texture} = new CFClient::Texture 120 $self->{fow_texture} = new CFClient::Texture
… …
120 glEnable GL_BLEND; 129 glEnable GL_BLEND;
121 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 130 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
122 glEnable GL_TEXTURE_2D; 131 glEnable GL_TEXTURE_2D;
123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 132 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
124 133
125 glColor +($::CFG->{fow_intensity}) x 3, 1; 134 glColor +($::CFG->{fow_intensity}) x 3, 0.8;
126 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32); 135 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
127 136
128 glDisable GL_TEXTURE_2D; 137 glDisable GL_TEXTURE_2D;
129 glDisable GL_BLEND; 138 glDisable GL_BLEND;
130 } 139 }
131 140
132 # HACK BEGIN 141 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 } 142 }
156 143
157 glEndList; 144 glEndList;
158 } 145 }
159 146
160 glPushMatrix; 147 glPushMatrix;
161 glCallList $self->{list}; 148 glCallList $self->{list};
162 glPopMatrix; 149 glPopMatrix;
163 150
151 # TNT2 emulates logops in software (or worse :)
164 if ($CFClient::UI::FOCUS != $self) { 152 if ($CFClient::UI::FOCUS != $self) {
165 glColor 64/255, 64/255, 64/255; 153 glColor 0.4, 0.2, 0.2, 0.9;
166 glLogicOp GL_AND; 154 glEnable GL_BLEND;
167 glEnable GL_COLOR_LOGIC_OP; 155 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
168 glBegin GL_QUADS; 156 glBegin GL_QUADS;
169 glVertex 0, 0; 157 glVertex 0, 0;
170 glVertex 0, $::HEIGHT; 158 glVertex 0, $::HEIGHT;
171 glVertex $::WIDTH, $::HEIGHT; 159 glVertex $::WIDTH, $::HEIGHT;
172 glVertex $::WIDTH, 0; 160 glVertex $::WIDTH, 0;
173 glEnd; 161 glEnd;
174 glDisable GL_COLOR_LOGIC_OP; 162 glDisable GL_BLEND;
175 } 163 }
176} 164}
177 165
178my %DIR = ( 166my %DIR = (
179 SDLK_KP8, [1, "north"], 167 CFClient::SDLK_KP8, [1, "north"],
180 SDLK_KP9, [2, "northeast"], 168 CFClient::SDLK_KP9, [2, "northeast"],
181 SDLK_KP6, [3, "east"], 169 CFClient::SDLK_KP6, [3, "east"],
182 SDLK_KP3, [4, "southeast"], 170 CFClient::SDLK_KP3, [4, "southeast"],
183 SDLK_KP2, [5, "south"], 171 CFClient::SDLK_KP2, [5, "south"],
184 SDLK_KP1, [6, "southwest"], 172 CFClient::SDLK_KP1, [6, "southwest"],
185 SDLK_KP4, [7, "west"], 173 CFClient::SDLK_KP4, [7, "west"],
186 SDLK_KP7, [8, "northwest"], 174 CFClient::SDLK_KP7, [8, "northwest"],
187 175
188 SDLK_UP, [1, "north"], 176 CFClient::SDLK_UP, [1, "north"],
189 SDLK_RIGHT, [3, "east"], 177 CFClient::SDLK_RIGHT, [3, "east"],
190 SDLK_DOWN, [5, "south"], 178 CFClient::SDLK_DOWN, [5, "south"],
191 SDLK_LEFT, [7, "west"], 179 CFClient::SDLK_LEFT, [7, "west"],
192); 180);
193 181
194sub key_down { 182sub key_down {
195 my ($self, $ev) = @_; 183 my ($self, $ev) = @_;
196 184
185 return unless $::CONN;
186
197 my $mod = $ev->key_mod; 187 my $mod = $ev->{mod};
198 my $sym = $ev->key_sym; 188 my $sym = $ev->{sym};
189 my $uni = $ev->{unicode};
199 190
200 if ($sym == SDLK_KP5) { 191 if ($sym == CFClient::SDLK_KP5) {
201 $::CONN->user_send ("stay fire"); 192 $::CONN->user_send ("stay fire");
202 } elsif ($sym == SDLK_a) { 193 } elsif ($uni == ord ",") {
194 $::CONN->user_send ("take");
195 } elsif ($uni == ord "\t" or $uni == ord " ") {
203 $::CONN->user_send ("apply"); 196 $::CONN->user_send ("apply");
204 } elsif ($sym == SDLK_QUOTE) { 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 -");
201 } elsif ($uni == ord "'") {
205 $self->emit ('activate_console'); 202 $self->emit ('activate_console');
206 } elsif ($sym == SDLK_SLASH) { 203 } elsif ($uni == ord "/") {
207 $self->emit ('activate_console' => '/'); 204 $self->emit (activate_console => '/');
208 } elsif (exists $DIR{$sym}) { 205 } elsif (exists $DIR{$sym}) {
209 if ($mod & KMOD_SHIFT) { 206 if ($mod & CFClient::KMOD_SHIFT) {
210 $self->{shft}++; 207 $self->{shft}++;
211 $::CONN->user_send ("fire $DIR{$sym}[0]"); 208 $::CONN->user_send ("fire $DIR{$sym}[0]");
212 } elsif ($mod & KMOD_CTRL) { 209 } elsif ($mod & CFClient::KMOD_CTRL) {
213 $self->{ctrl}++; 210 $self->{ctrl}++;
214 $::CONN->user_send ("run $DIR{$sym}[0]"); 211 $::CONN->user_send ("run $DIR{$sym}[0]");
215 } else { 212 } else {
216 $::CONN->user_send ("$DIR{$sym}[1]"); 213 $::CONN->user_send ("$DIR{$sym}[1]");
217 } 214 }
215 } elsif ($ev->{unicode}) {
216 $self->{command_widget} ||=
217 new CFClient::MapWidget::Command::
218 command => $self->{command},
219 can_focus => 1,
220 connect_execute => sub {
221 # todo: support callback instead of user_send
222 $::CONN->user_send ($_[1]);
223 },
224 connect_close => sub {
225 (delete $self->{command_widget})->hide;
226 $self->focus_in;
227 },
228 ;
229 $self->{command_widget}->key_down ($ev)
230 unless $ev->{unicode} == 20;
231 return unless $self->{command_widget};
232 $self->{command_widget}->show;
233 $self->{command_widget}->focus_in;
218 } 234 }
219} 235}
220 236
221sub key_up { 237sub key_up {
222 my ($self, $ev) = @_; 238 my ($self, $ev) = @_;
223 239
224 my $mod = $ev->key_mod; 240 my $mod = $ev->{mod};
225 my $sym = $ev->key_sym; 241 my $sym = $ev->{sym};
226 242
227 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 243 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
228 $::CONN->user_send ("fire_stop"); 244 $::CONN->user_send ("fire_stop");
229 } 245 }
230 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 246 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
231 $::CONN->user_send ("run_stop"); 247 $::CONN->user_send ("run_stop");
232 } 248 }
233} 249}
234 250
235sub add_command { 251sub add_command {
236 my ($self, $command, $widget, $cb) = @_; 252 my ($self, $command, $tooltip, $widget, $cb) = @_;
237 253
238 (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]*/$1/g; 254 (my $data = $command) =~ s/\\//g;
239 warn "$command|$abbrev|$widget\n";#d# 255
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;
348}
349
350package CFClient::MapWidget::Command;
351
352use strict;
353
354use CFClient::OpenGL;
355
356our @ISA = CFClient::UI::Frame::;
357
358sub new {
359 my $class = shift;
360
361 my $self = $class->SUPER::new (
362 bg => [0, 0, 0, 0.8],
363 @_,
364 );
365
366 $self->add ($self->{vbox} = new CFClient::UI::VBox);
367
368 $self->{label} = [
369 map
370 CFClient::UI::Label->new (
371 can_hover => 1,
372 can_events => 1,
373 tooltip_width => 0.33,
374 fontsize => $_,
375 ), (0.8) x 16
376 ];
377
378 $self->{entry} = new CFClient::UI::Entry
379 connect_changed => sub {
380 $self->update_labels;
381 };
382
383 $self->{vbox}->add (
384 $self->{entry},
385 @{$self->{label}},
386 );
387
388 $self
389}
390
391sub size_allocate {
392 my ($self, $w, $h) = @_;
393
394 $self->SUPER::size_allocate ($w, $h);
395 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
396}
397
398sub key_down {
399 my ($self, $ev) = @_;
400
401 if ($ev->{sym} == 13) {
402 if (exists $self->{select}) {
403 $self->emit (execute => $self->{select});
404 $self->emit ("close");
405 }
406 } elsif ($ev->{sym} == 27) {
407 $self->{entry}->set_text ("");
408 $self->emit ("close");
409 return;
410 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
411 ++$self->{select_offset}
412 if $self->{select_offset} < $#{ $self->{last_match} || [] };
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);
421 }
422}
423
424sub update_labels {
425 my ($self) = @_;
426
427 my $text = $self->{entry}->get_text;
428
429 length $text
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;
240} 522}
241 523
2421 5241

Diff Legend

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