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.6 by root, Thu Apr 20 08:11:57 2006 UTC vs.
Revision 1.13 by root, Mon Apr 24 11:45:17 2006 UTC

… …
25 glDeleteList $self->{list}; 25 glDeleteList $self->{list};
26 26
27 $self->SUPER::DESTROY; 27 $self->SUPER::DESTROY;
28} 28}
29 29
30sub key_down {
31 print "MAPKEYDOWN\n";
32}
33
34sub key_up {
35}
36
37sub button_down { 30sub button_down {
38 my ($self, $ev, $x, $y) = @_; 31 my ($self, $ev, $x, $y) = @_;
39 32
40 $self->focus_in; 33 $self->focus_in;
41 34
… …
87 80
88 if (delete $self->{need_update}) { 81 if (delete $self->{need_update}) {
89 glNewList $self->{list}; 82 glNewList $self->{list};
90 83
91 if ($::MAP) { 84 if ($::MAP) {
92 my $sw = int $::WIDTH / 32; 85 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale});
93 my $sh = int $::HEIGHT / 32; 86 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale});
94 87
88 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
89
95 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32; 90 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; 91 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
97 92
98 glTranslate $sx0 - 32, $sy0 - 32, 0; 93 glTranslate $sx0 - 32, $sy0 - 32, 0;
99 94
100 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 95 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
101 96
… …
106 GL_CONVOLUTION_2D, 101 GL_CONVOLUTION_2D,
107 GL_ALPHA, 102 GL_ALPHA,
108 3, 3, 103 3, 3,
109 GL_ALPHA, GL_FLOAT, 104 GL_ALPHA, GL_FLOAT,
110 pack "f*", 105 pack "f*",
111 0.1, 0.1, 0.1, 106 0.05, 0.13, 0.05,
112 0.1, 0.2, 0.1, 107 0.13, 0.30, 0.13,
113 0.1, 0.1, 0.1, 108 0.05, 0.13, 0.05,
114 ); 109 );
115 glEnable GL_CONVOLUTION_2D; 110 glEnable GL_CONVOLUTION_2D;
116 } 111 }
117 112
118 $self->{fow_texture} = new CFClient::Texture 113 $self->{fow_texture} = new CFClient::Texture
… …
127 glEnable GL_BLEND; 122 glEnable GL_BLEND;
128 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 123 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
129 glEnable GL_TEXTURE_2D; 124 glEnable GL_TEXTURE_2D;
130 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 125 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
131 126
132 glColor +($::CFG->{fow_intensity}) x 3, 1; 127 glColor +($::CFG->{fow_intensity}) x 3, 0.8;
133 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32); 128 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
134 129
135 glDisable GL_TEXTURE_2D; 130 glDisable GL_TEXTURE_2D;
136 glDisable GL_BLEND; 131 glDisable GL_BLEND;
137 } 132 }
… …
224 } elsif ($sym == ord "a") { 219 } elsif ($sym == ord "a") {
225 $::CONN->user_send ("apply"); 220 $::CONN->user_send ("apply");
226 } elsif ($sym == ord "'") { 221 } elsif ($sym == ord "'") {
227 $self->emit ('activate_console'); 222 $self->emit ('activate_console');
228 } elsif ($sym == ord "/") { 223 } elsif ($sym == ord "/") {
229 $self->emit ('activate_console' => '/'); 224 $self->emit (activate_console => '/');
230 } elsif (exists $DIR{$sym}) { 225 } elsif (exists $DIR{$sym}) {
231 if ($mod & CFClient::KMOD_SHIFT) { 226 if ($mod & CFClient::KMOD_SHIFT) {
232 $self->{shft}++; 227 $self->{shft}++;
233 $::CONN->user_send ("fire $DIR{$sym}[0]"); 228 $::CONN->user_send ("fire $DIR{$sym}[0]");
234 } elsif ($mod & CFClient::KMOD_CTRL) { 229 } elsif ($mod & CFClient::KMOD_CTRL) {
235 $self->{ctrl}++; 230 $self->{ctrl}++;
236 $::CONN->user_send ("run $DIR{$sym}[0]"); 231 $::CONN->user_send ("run $DIR{$sym}[0]");
237 } else { 232 } else {
238 $::CONN->user_send ("$DIR{$sym}[1]"); 233 $::CONN->user_send ("$DIR{$sym}[1]");
239 } 234 }
235 } elsif ($ev->{unicode}) {
236 $self->{command_widget} ||=
237 new CFClient::MapWidget::Command::
238 command => $self->{command},
239 can_focus => 1,
240 connect_execute => sub {
241 # todo: support callback instead of user_send
242 $::CONN->user_send ($_[1][1]);
243 },
244 connect_close => sub {
245 (delete $self->{command_widget})->hide;
246 $self->focus_in;
247 },
248 ;
249 $self->{command_widget}->key_down ($ev);
250 return unless $self->{command_widget};
251 $self->{command_widget}->show;
252 $self->{command_widget}->focus_in;
240 } 253 }
241} 254}
242 255
243sub key_up { 256sub key_up {
244 my ($self, $ev) = @_; 257 my ($self, $ev) = @_;
… …
253 $::CONN->user_send ("run_stop"); 266 $::CONN->user_send ("run_stop");
254 } 267 }
255} 268}
256 269
257sub add_command { 270sub add_command {
258 my ($self, $command, $widget, $cb) = @_; 271 my ($self, $command, $tooltip, $widget, $cb) = @_;
259 272
260 (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g; 273 (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;
261 warn "$command|$abbrev|$widget\n";#d# 274
275 push @{$self->{command}}, [$abbrev, $command, $tooltip, $widget, $cb];
276}
277
278package CFClient::MapWidget::Command;
279
280use strict;
281
282use CFClient::OpenGL;
283
284our @ISA = CFClient::UI::VBox::;
285
286sub new {
287 my $class = shift;
288
289 my $self = $class->SUPER::new (
290 @_,
291 children => [map
292 CFClient::UI::Label->new (
293 can_hover => 1,
294 can_events => 1,
295 fontsize => $_,
296 ), 1, 1, 0.8, 0.8, 0.8, 0.8, 0.8
297 ],
298 );
299
300 $self
301}
302
303sub size_allocate {
304 my ($self, $w, $h) = @_;
305
306 $self->SUPER::size_allocate ($w, $h);
307 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
308}
309
310sub update_labels {
311 my ($self) = @_;
312
313 my $command = $self->{command};
314 my $search_abbrev = qr/^\Q$self->{search}/;
315 my $search_full = qr/\Q$self->{search}/;
316
317 my @found;
318
319 for (@$command) {
320 if ($_->[0] =~ $search_abbrev) {
321 push @found, [$_->[0], $_];
322 } elsif ($_[1] =~ $search_full) {
323 push @found, [$_->[1], $_];
324 }
325 }
326
327 @found = sort { $a->[0] cmp $b->[0] } @found;
328
329 $self->{children}[0]->set_text ("$self->{search}_");
330
331 for (0..5) {
332 $self->{children}[$_ + 1]->set_text ($found[$_] ? "$found[$_][0] ($found[$_][1][1])" : "");
333 $self->{children}[$_ + 1]{tooltip} = ($found[$_] ? $found[$_][1][2] : "");
334 }
335
336 $self->{select} = $found[0][1]
337 if @found;
338
339 if (@found > 6) {
340 $self->{children}[6]->set_text ("...");
341 }
342
343 $self->check_size;
344}
345
346sub key_down {
347 my ($self, $ev) = @_;
348
349 if ($ev->{sym} == 8) {
350 substr $self->{search}, -1, 1, "";
351 $self->update_labels;
352 } elsif ($ev->{sym} == 13) {
353 if (exists $self->{select}) {
354 $self->emit (execute => $self->{select});
355 $self->emit ("close");
356 }
357 } elsif ($ev->{sym} == 27) {
358 $self->emit ("close");
359 return;
360 } elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) {
361 $self->{search} .= chr $ev->{unicode};
362 $self->update_labels;
363 }
364
365 length $self->{search}
366 or $self->emit ("close");
262} 367}
263 368
2641 3691

Diff Legend

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